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

List:       kde-commits
Subject:    [kwin] /: [wayland] Do not start composite timer if Workspace is not ready yet
From:       Martin_Gräßlin <mgraesslin () kde ! org>
Date:       2015-03-18 15:39:30
Message-ID: E1YYG4A-0001Iu-Vw () scm ! kde ! org
[Download RAW message or body]

Git commit 862bb95ffb39aebea42163923ce724b72339f7de by Martin Gr=C3=A4=C3=
=9Flin.
Committed on 18/03/2015 at 15:27.
Pushed by graesslin into branch 'master'.

[wayland] Do not start composite timer if Workspace is not ready yet

Could cause a race during startup resulting in crash.

M  +3    -0    composite.cpp

http://commits.kde.org/kwin/862bb95ffb39aebea42163923ce724b72339f7de

diff --git a/composite.cpp b/composite.cpp
index a448ec5..f0d41ae 100644
--- a/composite.cpp
+++ b/composite.cpp
@@ -744,6 +744,9 @@ void Compositor::setCompositeTimer()
 {
     if (!hasScene())  // should not really happen, but there may be e.g. s=
ome damage events still pending
         return;
+    if (!Workspace::self()) {
+        return;
+    }
 =

     // Don't start the timer if we're waiting for a swap event
     if (m_bufferSwapPending && m_composeAtSwapCompletion)
[prev in list] [next in list] [prev in thread] [next in thread]