From a34daf6851ce07c215560ec5734997eb0e149418 Mon Sep 17 00:00:00 2001 From: volzhs Date: Wed, 16 May 2018 16:54:04 +0900 Subject: [PATCH] Fix segfault at quiting editor (cherry picked from commit e639db0529d97f6b797503617906cd26c2a06021) --- scene/gui/color_picker.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp index 30bcc481492..8bb1c6a953d 100644 --- a/scene/gui/color_picker.cpp +++ b/scene/gui/color_picker.cpp @@ -636,7 +636,7 @@ void ColorPickerButton::_notification(int p_what) { draw_rect(r, picker->get_pick_color()); } - if (p_what == MainLoop::NOTIFICATION_WM_QUIT_REQUEST) { + if (p_what == MainLoop::NOTIFICATION_WM_QUIT_REQUEST && popup) { popup->hide(); } }