浏览代码

Merge pull request #78582 from Sauermann/fix-mouse-focus-nullcheck

Re-add `mouse_focus`-nullcheck
Rémi Verschelde 2 年之前
父节点
当前提交
b0c3c00d25
共有 1 个文件被更改,包括 1 次插入2 次删除
  1. 1 2
      scene/main/viewport.cpp

+ 1 - 2
scene/main/viewport.cpp

@@ -1771,8 +1771,7 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
 				}
 				}
 			}
 			}
 
 
-			bool stopped = gui.mouse_focus->can_process() && _gui_call_input(gui.mouse_focus, mb);
-
+			bool stopped = gui.mouse_focus && gui.mouse_focus->can_process() && _gui_call_input(gui.mouse_focus, mb);
 			if (stopped) {
 			if (stopped) {
 				set_input_as_handled();
 				set_input_as_handled();
 			}
 			}