summaryrefslogtreecommitdiffstats
path: root/kdesktop/lock/main.cc
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2014-12-02 21:09:43 -0600
committerTimothy Pearson <[email protected]>2014-12-02 21:09:43 -0600
commitaaa719d2e27ee6a1e0d556d9063869d454d0c176 (patch)
treec8e7dfc35ff3775d69f999d20d0faef1b501792c /kdesktop/lock/main.cc
parentff6fa6e087f84bcc2e79bec4e5e2ac178a21023e (diff)
downloadtdebase-aaa719d2e27ee6a1e0d556d9063869d454d0c176.tar.gz
tdebase-aaa719d2e27ee6a1e0d556d9063869d454d0c176.zip
Forcibly terminate kdesktop_lock after unlock
This resolves Bug 2222
Diffstat (limited to 'kdesktop/lock/main.cc')
-rw-r--r--kdesktop/lock/main.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc
index ce3be3f14..79799d129 100644
--- a/kdesktop/lock/main.cc
+++ b/kdesktop/lock/main.cc
@@ -529,13 +529,11 @@ int main( int argc, char **argv )
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
}
}
}