[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kwin/Plasma/5.7] /: Stop composite timer when Workspace gets destroyed
From:       Martin_Gräßlin <mgraesslin () kde ! org>
Date:       2016-06-29 6:36:03
Message-ID: E1bI96R-0001CE-28 () code ! kde ! org
[Download RAW message or body]

Git commit 3c6dff75d561aa9bcececaa97bd687ccdac1116d by Martin Gräßlin.
Committed on 29/06/2016 at 06:34.
Pushed by graesslin into branch 'Plasma/5.7'.

Stop composite timer when Workspace gets destroyed

On Wayland tear down the Workspace gets destroyed before the Compositor
gets destroyed. If the timer fires in that area, the Compositor would
crash. It's not possible to start the timer if the Workspace is
destroyed, thus it should also be stoped on Workspace destroy.

Reviewed-By: Bhushan Shah

M  +1    -0    composite.cpp

http://commits.kde.org/kwin/3c6dff75d561aa9bcececaa97bd687ccdac1116d

diff --git a/composite.cpp b/composite.cpp
index b867be5..f4d1e3d 100644
--- 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();
[prev in list] [next in list] [prev in thread] [next in thread]