Merge branch 'fix_qwindow_crash' into 'mer-5.6'

[qtgui] fix crash when QWindow gets deleted. Fixes JB#42211 See merge request mer-core/qtbase!37
sailfishos · Jun 29, 2018 · 8c82d84 · 8c82d84
2 parents 11c8f00 + 9399340
commit 8c82d84
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp
@@ -203,6 +203,8 @@ QWindow::QWindow(QWindowPrivate &dd, QWindow *parent)
 QWindow::~QWindow()
 {
     destroy();
+    if (QGuiApplicationPrivate::focus_window == this)
+        QGuiApplicationPrivate::focus_window = 0;
     QGuiApplicationPrivate::window_list.removeAll(this);
     if (!QGuiApplicationPrivate::is_app_closing)
         QGuiApplicationPrivate::instance()->modalWindowList.removeOne(this);