asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #32989 from nekomatata/fix-crash-rename-state

Browse source 
Fixed crashes when renaming a state in AnimationNodeStateMachineEditor
This commit is contained in:
Rémi Verschelde 2019-10-22 19:43:36 +02:00 committed by GitHub
commit aafd5dd5c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scene/gui/control.cpp
View file

@ -2221,9 +2221,11 @@ void Control::_modal_stack_remove() {
if (!data.MI)
return;
get_viewport()->_gui_remove_from_modal_stack(data.MI, data.modal_prev_focus_owner);
List<Control *>::Element *element = data.MI;
data.MI = NULL;
get_viewport()->_gui_remove_from_modal_stack(element, data.modal_prev_focus_owner);
data.modal_prev_focus_owner = 0;
}

1
scene/main/viewport.cpp
View file

@ -2374,7 +2374,6 @@ void Viewport::_gui_remove_from_modal_stack(List<Control *>::Element *MI, Object
List<Control *>::Element *next = MI->next();
gui.modal_stack.erase(MI);
MI = NULL;
if (p_prev_focus_owner) {