summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorHein-Pieter van Braam <hp@tmm.cx>2018-07-29 04:20:45 +0200
committerGitHub <noreply@github.com>2018-07-29 04:20:45 +0200
commitb62586c9f992c4f258ecdcb2cf734e02deabe0cb (patch)
tree600ae05acbdc77cc7c407dd5e10b527a2ef7d0ed /scene
parent5c88bc66e3a9dbfc4cd9d9a1ad8c7fc07c299a34 (diff)
parent1626ae642102cb4c5853f7a73fb9441093fc1de2 (diff)
Merge pull request #20546 from ibrahn/fix-menu-branch-on-uninit
fixed uninitialised variable that was causing menu crash.
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 573c401290..e43c2da02d 100644
--- a/scene/main/viewport.cpp
+++ b/scene/main/viewport.cpp
@@ -1860,7 +1860,7 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
if (over != top && !top->is_a_parent_of(over)) {
PopupMenu *popup_menu = Object::cast_to<PopupMenu>(top);
- MenuButton *popup_menu_parent;
+ MenuButton *popup_menu_parent = NULL;
MenuButton *menu_button = Object::cast_to<MenuButton>(over);
if (popup_menu)