From 9f70ddce3bc4705bf2c6300e4d6da9b25a39f854 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Thu, 30 Apr 2009 12:51:55 +0000 Subject: [PATCH] When reinitCompositing we can assume that the user wants to restart compositing even if compositing has been suspended. So we end suspend compositing and send signal that compositing is active. That way reinitCompositing behaves like resume compositing when suspended. BUG: 188118 svn path=/trunk/KDE/kdebase/workspace/; revision=961602 --- workspace.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/workspace.cpp b/workspace.cpp index cb375b1221..a02c4c4153 100644 --- a/workspace.cpp +++ b/workspace.cpp @@ -1118,9 +1118,14 @@ void Workspace::slotReinitCompositing() // Restart compositing finishCompositing(); + // resume compositing if suspended + compositingSuspended = false; setupCompositing(); if( effects ) // setupCompositing() may fail + { effects->reconfigure(); + emit compositingToggled( true ); + } } void Workspace::loadDesktopSettings()