summaryrefslogtreecommitdiff
path: root/scene/gui
diff options
context:
space:
mode:
authorKongfa Waroros <gongpha@hotmail.com>2021-02-18 19:53:32 +0700
committerKongfa Waroros <gongpha@hotmail.com>2021-02-18 20:30:22 +0700
commit7c6646c8acb98e8037cc7f4cc04ed1e38c7c602f (patch)
treebe38a0056489428fcbc41872a5e2fcf943428230 /scene/gui
parent81fc37b1ff98935eb36f52ffaba18659827816b4 (diff)
Avoid signal methods in ColorPicker to access the tree when it isn't in the tree
Diffstat (limited to 'scene/gui')
-rw-r--r--scene/gui/color_picker.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp
index a3205c27a7..b82c078a2d 100644
--- a/scene/gui/color_picker.cpp
+++ b/scene/gui/color_picker.cpp
@@ -578,6 +578,10 @@ void ColorPicker::_preset_input(const Ref<InputEvent> &p_event) {
}
void ColorPicker::_screen_input(const Ref<InputEvent> &p_event) {
+ if (!is_inside_tree()) {
+ return;
+ }
+
Ref<InputEventMouseButton> bev = p_event;
if (bev.is_valid() && bev->get_button_index() == BUTTON_LEFT && !bev->is_pressed()) {
emit_signal("color_changed", color);
@@ -607,6 +611,10 @@ void ColorPicker::_add_preset_pressed() {
}
void ColorPicker::_screen_pick_pressed() {
+ if (!is_inside_tree()) {
+ return;
+ }
+
Viewport *r = get_tree()->get_root();
if (!screen) {
screen = memnew(Control);