diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-04-07 14:10:50 +0200 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-04-07 14:10:50 +0200 |
| commit | 33d63f42f52fa21c10e15e4b9a0b94a87a130c87 (patch) | |
| tree | 21db87194c98c323ad532846a5f8b316411b2c16 /scene/gui | |
| parent | e7b6994e241c806284489dda217bafc63610f67a (diff) | |
| parent | 5ec7d3f264bd01f38046e52af28d950054cdce0b (diff) | |
Merge pull request #4257 from sanikoyes/Pr-gui-fix-warn
Fix warn print when hide an control does not inside_tree
Diffstat (limited to 'scene/gui')
| -rw-r--r-- | scene/gui/control.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp index b393f926e7..a30c05527c 100644 --- a/scene/gui/control.cpp +++ b/scene/gui/control.cpp @@ -604,8 +604,11 @@ void Control::_notification(int p_notification) { if(get_viewport() != NULL) get_viewport()->_gui_hid_control(this); - _modal_stack_remove(); - minimum_size_changed(); + + if(is_inside_tree()) { + _modal_stack_remove(); + minimum_size_changed(); + } //remove key focus //remove modalness |