Browse Source

Merge pull request #25894 from marcelofg55/last_mouse_focus_crash

Fix possible crash with an invalid last_mouse_focus pointer
Rémi Verschelde 6 years ago
parent
commit
3f74a54cd4
1 changed files with 3 additions and 0 deletions
  1. 3 0
      scene/main/viewport.cpp

+ 3 - 0
scene/main/viewport.cpp

@@ -2496,6 +2496,9 @@ void Viewport::_gui_remove_control(Control *p_control) {
 		gui.mouse_focus = NULL;
 		gui.mouse_focus_mask = 0;
 	}
+	if (gui.last_mouse_focus == p_control) {
+		gui.last_mouse_focus = NULL;
+	}
 	if (gui.key_focus == p_control)
 		gui.key_focus = NULL;
 	if (gui.mouse_over == p_control)