diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-12-03 13:43:13 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-12-03 13:43:13 +0900 |
| commit | 0da9700bfe53d403abe2c08567081c1ce60f1249 (patch) | |
| tree | f84de85d7f9b4d22133d4983c6bed2d41bdf865c | |
| parent | 804c7bec8e70f6faf8e4ad6b0a90220289f8d5e8 (diff) | |
| parent | aaa719d2e27ee6a1e0d556d9063869d454d0c176 (diff) | |
| download | tdebase-0da9700bfe53d403abe2c08567081c1ce60f1249.tar.gz tdebase-0da9700bfe53d403abe2c08567081c1ce60f1249.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
| -rw-r--r-- | kdesktop/lock/main.cc | 2 |
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 } } } |