From cd910e9254e07d2c1cc7b9aadeeef24ba96fbf78 Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Tue, 13 May 2014 16:05:17 +0200 Subject: [PATCH] Don't crash when platform plugin sends us two close events. Change-Id: Icfe2954908fad2abfb4195fc535aadd1e6302f76 Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/gui/kernel/qwindow.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp index d4c1f2ade3..bebf3ab6c4 100644 --- a/src/gui/kernel/qwindow.cpp +++ b/src/gui/kernel/qwindow.cpp @@ -1522,6 +1522,9 @@ void QWindow::resize(const QSize &newSize) void QWindow::destroy() { Q_D(QWindow); + if (!d->platformWindow) + return; + QObjectList childrenWindows = children(); for (int i = 0; i < childrenWindows.size(); i++) { QObject *object = childrenWindows.at(i); @@ -1791,6 +1794,9 @@ bool QWindow::close() if (parent()) return false; + if (!d->platformWindow) + return true; + if (QGuiApplicationPrivate::focus_window == this) QGuiApplicationPrivate::focus_window = 0; if (QGuiApplicationPrivate::currentMouseWindow == this)