diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-12-18 16:45:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-18 16:45:05 +0100 |
| commit | 9cda7f73339f8899fa0a8d0a7ca9e9a002a202ce (patch) | |
| tree | 14ad2a3cb968e64f5ab792c83c920dd80546b1df | |
| parent | 589f27933dcb44f3fd53b2e2691b934cfaa4986c (diff) | |
| parent | 2fa9585bdf914c4220c464f55c63db5775ea7aea (diff) | |
Merge pull request #34430 from volzhs/error-log-with-container
Fix error log when selecting child of Containers
| -rw-r--r-- | editor/plugins/canvas_item_editor_plugin.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index 6fd3f72c4f..17765c6454 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -4076,10 +4076,9 @@ void CanvasItemEditor::_popup_warning_depop(Control *p_control) { ERR_FAIL_COND(!popup_temporarily_timers.has(p_control)); Timer *timer = popup_temporarily_timers[p_control]; + timer->queue_delete(); p_control->hide(); - remove_child(timer); popup_temporarily_timers.erase(p_control); - memdelete(timer); info_overlay->set_margin(MARGIN_LEFT, (show_rulers ? RULER_WIDTH : 0) + 10); } |