summaryrefslogtreecommitdiffstats
path: root/scene
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2023-10-26 08:58:22 +0200
committerRémi Verschelde <rverschelde@gmail.com>2023-10-26 08:58:22 +0200
commite566167b48fa31a01bcb13d995d4b59ade488d14 (patch)
tree345f33b0510c3e09cd68780be7bb965bdf44141b /scene
parent8835db5f37bd06e3186a5122ac11c81d82103afd (diff)
parent47d601b3160c5ad77bc9de0145120c2a4ff372d7 (diff)
downloadredot-engine-e566167b48fa31a01bcb13d995d4b59ade488d14.tar.gz
Merge pull request #83925 from jsjtxietian/fix-timer-error-when-base-button-leave-tree-and-feedback
Fix BaseButton `shortcut_feedback`'s timer will raise error when the button is removed from the scene tree
Diffstat (limited to 'scene')
-rw-r--r--scene/gui/base_button.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/gui/base_button.cpp b/scene/gui/base_button.cpp
index f57afb66b3..66b14dc967 100644
--- a/scene/gui/base_button.cpp
+++ b/scene/gui/base_button.cpp
@@ -380,7 +380,7 @@ void BaseButton::shortcut_input(const Ref<InputEvent> &p_event) {
queue_redraw();
accept_event();
- if (shortcut_feedback) {
+ if (shortcut_feedback && is_inside_tree()) {
if (shortcut_feedback_timer == nullptr) {
shortcut_feedback_timer = memnew(Timer);
shortcut_feedback_timer->set_one_shot(true);