Fix TDM hang in certain circumstances when themed greeter is deleted

This resolves Bug 1453
Resolve themed greeter drawing inconsistencies between composited and non-composited mode

1 files changed, 7 insertions, 1 deletions

diff --git a/twin/workspace.cpp b/twin/workspace.cpp
index cae56b2f9..f55561ac6 100644
--- a/twin/workspace.cpp
+++ b/twin/workspace.cpp
@@ -59,9 +59,14 @@ TDEProcess* kompmgr = 0;
 TDESelectionOwner* kompmgr_selection;
 
 bool allowKompmgrRestart = TRUE;
+extern bool disable_twin_composition_manager;
 
 bool supportsCompMgr()
 {
+    if (disable_twin_composition_manager) {
+        return false;
+    }
+
     int i;
 
     bool damageExt = XQueryExtension(tqt_xdisplay(), "DAMAGE", &i, &i, &i);
@@ -213,8 +218,9 @@ Workspace::Workspace( bool restore )
     connect( kapp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized()));
 #endif
 
-    if (!supportsCompMgr())
+    if (!supportsCompMgr()) {
         options->useTranslucency = false;
+    }
 
     // start kompmgr - i wanted to put this into main.cpp, but that would prevent dcop support, as long as Application was no dcop_object
     if (options->useTranslucency)