godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-09 12:50:35 +00:00
Code Releases Wiki Activity

Merge pull request #22830 from Faless/fix_joypad_tree_crash

Browse Source 
Fix crash in Tree when moving using Joypad
This commit is contained in:
Max Hilbrunner
2018-10-07 18:41:35 +02:00
committed by GitHub
parent 604810f611 e355a8fc4c
commit b04b83bdce
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scene/gui/tree.cpp
View File

@@ -2183,6 +2183,7 @@ void Tree::_gui_input(Ref<InputEvent> p_event) {
Ref<InputEventKey> k = p_event;
bool is_command = k.is_valid() && k->get_command();
if (p_event->is_action("ui_right") && p_event->is_pressed()) {
if (!cursor_can_exit_tree) accept_event();
@@ -2219,13 +2220,13 @@ void Tree::_gui_input(Ref<InputEvent> p_event) {
_go_left();
}
} else if (p_event->is_action("ui_up") && p_event->is_pressed() && !k->get_command()) {
} else if (p_event->is_action("ui_up") && p_event->is_pressed() && !is_command) {
if (!cursor_can_exit_tree) accept_event();
_go_up();
} else if (p_event->is_action("ui_down") && p_event->is_pressed() && !k->get_command()) {
} else if (p_event->is_action("ui_down") && p_event->is_pressed() && !is_command) {
if (!cursor_can_exit_tree) accept_event();