summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvolzhs <volzhs@gmail.com>2019-12-18 23:54:13 +0900
committervolzhs <volzhs@gmail.com>2019-12-19 00:04:10 +0900
commit2fa9585bdf914c4220c464f55c63db5775ea7aea (patch)
tree27ff0418204d6b8ce77dc20ae1944c485f8d40ca
parentd1bce5c679bd77b50ddae2c3841e5157c6a0b917 (diff)
Fix error log when selecting child of Containers
-rw-r--r--editor/plugins/canvas_item_editor_plugin.cpp3
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);
}