From 65c96a71bd5593a7a6b0aaaf80ae68fceca849b9 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Sun, 26 Apr 2015 15:42:02 -0300 Subject: fix crash on exit for popup, fixes #1676 --- scene/gui/control.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp index cef2941010..22559c238c 100644 --- a/scene/gui/control.cpp +++ b/scene/gui/control.cpp @@ -524,13 +524,15 @@ void Control::_notification(int p_notification) { if (data.MI) { - data.window->window->modal_stack.erase(data.MI); + if (data.window && data.window->window) + data.window->window->modal_stack.erase(data.MI); data.MI=NULL; } if (data.SI) { //erase from subwindows - data.window->window->subwindows.erase(data.SI); + if (data.window && data.window->window) + data.window->window->subwindows.erase(data.SI); data.SI=NULL; } -- cgit v1.2.3