From 75c68f65129d404e3ab3be1009bd414a450da85e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20J=2E=20Est=C3=A9banez?= Date: Wed, 22 Feb 2017 01:36:31 +0100 Subject: Fix crash if TouchScreenButton is pressed while exiting the tree (cherry picked from commit 5b8d5766f4574b5011b3f258d3e9b34298eb609c) --- scene/2d/screen_button.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'scene/2d') diff --git a/scene/2d/screen_button.cpp b/scene/2d/screen_button.cpp index efe23e67f2..4b607e9261 100644 --- a/scene/2d/screen_button.cpp +++ b/scene/2d/screen_button.cpp @@ -308,12 +308,14 @@ void TouchScreenButton::_release(bool p_exiting_tree) { if (action_id!=-1) { Input::get_singleton()->action_release(action); - InputEvent ie; - ie.type=InputEvent::ACTION; - ie.ID=0; - ie.action.action=action_id; - ie.action.pressed=false; - get_tree()->input_event(ie); + if (!p_exiting_tree) { + InputEvent ie; + ie.type=InputEvent::ACTION; + ie.ID=0; + ie.action.action=action_id; + ie.action.pressed=false; + get_tree()->input_event(ie); + } } if (!p_exiting_tree) { -- cgit v1.2.3