diff options
| author | Geequlim | 2018-05-08 13:52:38 +0800 |
|---|---|---|
| committer | Hein-Pieter van Braam | 2018-05-13 21:56:56 +0200 |
| commit | 0c030d6e0850e8ee185ec57b7e24e3552678c9d2 (patch) | |
| tree | a110c934910aa8faf9af86ad315f81012459f89e /scene/main/viewport.cpp | |
| parent | c8ce9c00805be16d660057079a665114507409df (diff) | |
| download | godot-0c030d6e0850e8ee185ec57b7e24e3552678c9d2.tar.gz godot-0c030d6e0850e8ee185ec57b7e24e3552678c9d2.tar.zst godot-0c030d6e0850e8ee185ec57b7e24e3552678c9d2.zip | |
Fix double free for drag preview control in viewport
(cherry picked from commit 56c2463f8c1240fcf2376b7979991cbce3a3f1d3)
Diffstat (limited to '')
| -rw-r--r-- | scene/main/viewport.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index 4f702e8ed..1726ad618 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -2162,9 +2162,7 @@ void Viewport::_gui_set_drag_preview(Control *p_base, Control *p_control) { p_control->set_position(gui.last_mouse_pos); p_base->get_root_parent_control()->add_child(p_control); //add as child of viewport p_control->raise(); - if (gui.drag_preview) { - memdelete(gui.drag_preview); - } + gui.drag_preview = p_control; } |