b3c03fa · unity8 · git.iko.soy

on xenial help sign in

added workspace check

b3c03faNick Dedekind10 years ago

plugins/WindowManager/TopLevelWindowModel.cpp+2

@@ -399,6 +399,7 @@ void TopLevelWindowModel::onSurfaceCreated(unityapi::MirSurfaceInterface */*surf

399void TopLevelWindowModel::onSurfacesAddedToWorkspace(const std::shared_ptr<miral::Workspace>& workspace,

400 const QVector<unity::shell::application::MirSurfaceInterface*> surfaces)

401{

402+ if (!m_workspace || !m_applicationManager) return;

402 if (workspace != m_workspace->workspace()) return;

403 if (workspace != m_workspace->workspace()) return;

403

404

404 Q_FOREACH(auto surface, surfaces) {

405 Q_FOREACH(auto surface, surfaces) {

@@ -829,6 +830,7 @@ void TopLevelWindowModel::refreshWindows()

829 m_windowModel.clear();

830 m_windowModel.clear();

830 m_allSurfaces.clear();

831 m_allSurfaces.clear();

831

832

833+ if (!m_workspace || !m_applicationManager) return;

832 WindowManagementPolicy::instance()->forEachWindowInWorkspace(m_workspace->workspace(), [this](const miral::Window &window) {

834 WindowManagementPolicy::instance()->forEachWindowInWorkspace(m_workspace->workspace(), [this](const miral::Window &window) {

833 auto surface = m_surfaceManager->surfaceFor(window);

835 auto surface = m_surfaceManager->surfaceFor(window);

834 if (surface) {

836 if (surface) {