summaryrefslogtreecommitdiff
path: root/scene/gui
diff options
context:
space:
mode:
authorshaderbeast <jd16581556@gmail.com>2019-09-01 01:25:22 +0200
committershaderbeast <jd16581556@gmail.com>2019-09-03 13:26:41 +0200
commit5e337b31ebcf4509e1cf4cb64b02908ade59df05 (patch)
treec221b3525d130ecc7823900a0f14321116752541 /scene/gui
parent00aabec8bb598592b8a8702797b51fc9f6ca6169 (diff)
Added is_inside_tree() check in both Timer and Tween
Tween now throws error and doesnt even execute.
Diffstat (limited to 'scene/gui')
-rw-r--r--scene/gui/control.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp
index 034e9266f6..174c2fce7d 100644
--- a/scene/gui/control.cpp
+++ b/scene/gui/control.cpp
@@ -2149,9 +2149,7 @@ bool Control::has_focus() const {
void Control::grab_focus() {
- if (!is_inside_tree()) {
- ERR_FAIL_COND(!is_inside_tree());
- }
+ ERR_FAIL_COND(!is_inside_tree());
if (data.focus_mode == FOCUS_NONE) {
WARN_PRINT("This control can't grab focus. Use set_focus_mode() to allow a control to get focus.");