diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2018-05-16 08:02:09 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-16 08:02:09 -0300 |
| commit | 66dc73f3ca5ba5f4ef191e23bcf89bdb073caf0d (patch) | |
| tree | e51f63eed2d887f7635dd406a499d81b6bc143ba /scene | |
| parent | b49cb7d8797fee8545b51a5f4aa889298124577d (diff) | |
| parent | e639db0529d97f6b797503617906cd26c2a06021 (diff) | |
Merge pull request #18922 from volzhs/fix-segfault
Fix segfault at quiting editor
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/gui/color_picker.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp index 1e0db6e8cd..597ce33fea 100644 --- a/scene/gui/color_picker.cpp +++ b/scene/gui/color_picker.cpp @@ -684,7 +684,7 @@ void ColorPickerButton::_notification(int p_what) { draw_rect(r, color); } - if (p_what == MainLoop::NOTIFICATION_WM_QUIT_REQUEST) { + if (p_what == MainLoop::NOTIFICATION_WM_QUIT_REQUEST && popup) { popup->hide(); } } |