Don't crash when platform plugin sends us two close events.

Change-Id: Icfe2954908fad2abfb4195fc535aadd1e6302f76 Reviewed-by: Eskil Abrahamsen Blomfeldt <[email protected]>
brad0 · May 15, 2014 · cd910e9 · cd910e9
1 parent 1ae7c76
commit cd910e9
Showing 1 changed file with 6 additions and 0 deletions.
diff --git 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)