summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2018-12-02 17:13:54 +0100
committerGitHub <noreply@github.com>2018-12-02 17:13:54 +0100
commit7215f7475ef7f2dbe2bf4612dfe026d650976916 (patch)
treeb6df0f4c238df60396f54130c1c1a7c33b43d89f /scene
parent3ee062908bc2b977ee65403c08f7a71be4972bba (diff)
parentea6a5bb8fb886624f61bffece3df92e9491d12ce (diff)
Merge pull request #24104 from guilhermefelipecgs/fix_mouse_crash
Fix crash when multiple mouse buttons is pressed.
Diffstat (limited to 'scene')
-rw-r--r--scene/main/viewport.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
index 9ceac0d7b0..fd584e82ad 100644
--- a/scene/main/viewport.cpp
+++ b/scene/main/viewport.cpp
@@ -1780,7 +1780,7 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
}
}
- if (gui.mouse_focus->can_process()) {
+ if (gui.mouse_focus && gui.mouse_focus->can_process()) {
_gui_call_input(gui.mouse_focus, mb);
}