Merge lp:~gerboland/miral/fix-crash-on-window-close into lp:miral

[Gerry Boland]

[miral-qt] Fix crash where we try to use a focused window after it has been removed

To test, run gnome-calculator, and change modes.

[Alan Griffiths (alan-griffiths)]

Works for me.

review: Approve

=== modified file 'miral-qt/src/modules/Unity/Application/windowmodel.cpp'
--- miral-qt/src/modules/Unity/Application/windowmodel.cpp	2016-08-25 10:20:56 +0000
+++ miral-qt/src/modules/Unity/Application/windowmodel.cpp	2016-09-01 12:10:18 +0000
@@ -81,7 +81,10 @@
 void WindowModel::onWindowRemoved(const int index)
 {
     beginRemoveRows(QModelIndex(), index, index);
-    m_windowModel.remove(index);
+    auto window = m_windowModel.takeAt(index);
+    if (window == m_focusedWindow) {
+        m_focusedWindow = nullptr;
+    }
     endRemoveRows();
     Q_EMIT countChanged();
 }