@@ -421,7 +421,7 @@ void TopLevelWindowModel::onSurfacesAddedToWorkspace(const std::shared_ptr<miral
421void TopLevelWindowModel::onSurfacesAboutToBeRemovedFromWorkspace(const std::shared_ptr<miral::Workspace> &workspace,
421void TopLevelWindowModel::onSurfacesAboutToBeRemovedFromWorkspace(const std::shared_ptr<miral::Workspace> &workspace,
422 const QVector<unity::shell::application::MirSurfaceInterface *> surfaces)
422 const QVector<unity::shell::application::MirSurfaceInterface *> surfaces)
424− if (workspace != m_workspace->workspace()) return;
424+ if (!m_workspace || workspace != m_workspace->workspace()) return;
426 int start = -1;
426 int start = -1;
427 int end = -1;
427 int end = -1;