Merge branch 'Plasma/5.7'

2016-06-29 08:36:44 +02:00 · 2016-06-29 08:36:44 +02:00 · d19f9a96b4
commit d19f9a96b4
parent 3ec8e5ce75 3c6dff75d5
1 changed files with 1 additions and 0 deletions
--- a/composite.cpp
+++ b/composite.cpp
@ -296,6 +296,7 @@ void Compositor::startupWithWorkspace()
        return;
    }
    Q_ASSERT(m_scene);
+    connect(workspace(), &Workspace::destroyed, this, [this] { compositeTimer.stop(); });
    claimCompositorSelection();
    m_xrrRefreshRate = KWin::currentRefreshRate();
    fpsInterval = options->maxFpsInterval();