merge prereq
commit75d41d4bb8ec3e3d93eaec8c4792f601d02074b9
authorMichael Zanetti <michael.zanetti@canonical.com>
dateWed 8 Mar 2017, 13:10 (10 years ago)
parent325ade420b95b0
plugins/WindowManager/TopLevelWindowModel.cpp+1−1
@@ -421,7 +421,7 @@ void TopLevelWindowModel::onSurfacesAddedToWorkspace(const std::shared_ptr<miral
421421void TopLevelWindowModel::onSurfacesAboutToBeRemovedFromWorkspace(const std::shared_ptr<miral::Workspace> &workspace,
422422 const QVector<unity::shell::application::MirSurfaceInterface *> surfaces)
423423{
424− if (workspace != m_workspace->workspace()) return;
424+ if (!m_workspace || workspace != m_workspace->workspace()) return;
425425
426426 int start = -1;
427427 int end = -1;