From d24411b9ac0439c3b75dcc5849e75267b77a1d1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Tue, 20 Oct 2015 11:41:04 +0200 Subject: [PATCH] Don't perform Compositor::setCompositeTimer during startup The check whether Workspace is created is not sufficient. There's a time when Workspace is already created but Compositor not ready yet and where we can hit this code path. --- composite.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composite.cpp b/composite.cpp index 58f78564e0..328f5aaf6d 100644 --- a/composite.cpp +++ b/composite.cpp @@ -772,7 +772,7 @@ void Compositor::setCompositeTimer() { if (!hasScene()) // should not really happen, but there may be e.g. some damage events still pending return; - if (!Workspace::self()) { + if (m_starting || !Workspace::self()) { return; }