summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2016-01-11 08:47:37 +0100
committerRémi Verschelde <remi@verschelde.fr>2016-01-11 08:47:37 +0100
commit90e5fba1c137b99eb767f73c98a34c353dcec7f2 (patch)
treed3786a1afd885494a33091c6f6472979b9017937 /scene
parent725b61bb6c71b0f3bd469bc9a9252c4e49ec5598 (diff)
parent3169b66d15e983e012b1da181672fef61f3660a0 (diff)
Merge pull request #3300 from MarianoGnu/bug_fixing
fix: TouchScreenButton should stop propagating action when button is …
Diffstat (limited to 'scene')
-rw-r--r--scene/2d/screen_button.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/scene/2d/screen_button.cpp b/scene/2d/screen_button.cpp
index d7f9b191fe..fac94f19dc 100644
--- a/scene/2d/screen_button.cpp
+++ b/scene/2d/screen_button.cpp
@@ -102,6 +102,10 @@ void TouchScreenButton::_notification(int p_what) {
action_id=-1;
}
} break;
+ case NOTIFICATION_EXIT_TREE: {
+ if (is_pressed())
+ Input::get_singleton()->action_release(action);
+ } break;
}
}