godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #34430 from volzhs/error-log-with-container 

Fix error log when selecting child of Containers
This commit is contained in:
Rémi Verschelde 2019-12-18 16:45:05 +01:00 committed by GitHub
parent 589f27933d 2fa9585bdf
commit 9cda7f7333
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
editor/plugins/canvas_item_editor_plugin.cpp
View File

@ -4076,10 +4076,9 @@ void CanvasItemEditor::_popup_warning_depop(Control *p_control) {
ERR_FAIL_COND(!popup_temporarily_timers.has(p_control)); ERR_FAIL_COND(!popup_temporarily_timers.has(p_control));
Timer *timer = popup_temporarily_timers[p_control]; Timer *timer = popup_temporarily_timers[p_control];
timer->queue_delete();
p_control->hide(); p_control->hide();
remove_child(timer);
popup_temporarily_timers.erase(p_control); popup_temporarily_timers.erase(p_control);
memdelete(timer);
info_overlay->set_margin(MARGIN_LEFT, (show_rulers ? RULER_WIDTH : 0) + 10); info_overlay->set_margin(MARGIN_LEFT, (show_rulers ? RULER_WIDTH : 0) + 10);
} }