Browse Source

Merge pull request #7869 from RandomShaper/fix-touchbutton-crash

Fix crash if TouchScreenButton is pressed while exiting the tree
Rémi Verschelde 8 years ago
parent
commit
3abd4c906d
1 changed files with 8 additions and 6 deletions
  1. 8 6
      scene/2d/screen_button.cpp

+ 8 - 6
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) {