Browse Source

Merge pull request #30517 from kawa-yoiko/modal-freeze

Fix multiple popup freezing
Rémi Verschelde 6 years ago
parent
commit
7a643acb1f
1 changed files with 2 additions and 2 deletions
  1. 2 2
      scene/main/viewport.cpp

+ 2 - 2
scene/main/viewport.cpp

@@ -2579,7 +2579,7 @@ void Viewport::_drop_physics_mouseover() {
 
 List<Control *>::Element *Viewport::_gui_show_modal(Control *p_control) {
 
-	gui.modal_stack.push_back(p_control);
+	List<Control *>::Element *node = gui.modal_stack.push_back(p_control);
 	if (gui.key_focus)
 		p_control->_modal_set_prev_focus_owner(gui.key_focus->get_instance_id());
 	else
@@ -2590,7 +2590,7 @@ List<Control *>::Element *Viewport::_gui_show_modal(Control *p_control) {
 		_drop_mouse_focus();
 	}
 
-	return gui.modal_stack.back();
+	return node;
 }
 
 Control *Viewport::_gui_get_focus_owner() {