Branch: master

aaa719d2 2014-12-02 21:09:43 Timothy Pearson
Forcibly terminate kdesktop_lock after unlock
This resolves Bug 2222
M kdesktop/lock/main.cc
diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc
index ce3be3f..79799d1 100644
--- a/kdesktop/lock/main.cc
+++ b/kdesktop/lock/main.cc
@@ -529,13 +529,11 @@
             delete trinity_desktop_lock_process;
             trinity_desktop_lock_process = NULL;
 
-#if 0
             // FIXME
             // We should not have to return (restart) at all,
             // but it seems that some X11 connections are left active,
             // preventing the lock process from restarting properly in the while() loop above.
             return 0;
-#endif
         }
     }
 }