From c65396ed7628fb0065c4ebe8061ba978cf1443fc Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 26 Apr 2012 19:02:52 -0500 Subject: [PATCH] Fix corner case lock dialog hang (cherry picked from commit 5d286832f272ba6d1a955d4b952f34ed374bbf30) --- kdesktop/lock/main.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc index 3008b2c16..b10162f98 100644 --- a/kdesktop/lock/main.cc +++ b/kdesktop/lock/main.cc @@ -277,7 +277,8 @@ int main( int argc, char **argv ) trinity_desktop_lock_use_sak = tdmconfig->readBoolEntry("UseSAK", true); } else { - trinity_desktop_lock_use_sak = false; // If SAK is enabled with unmanaged windows, the SAK dialog will never close and will "burn in" the screen + trinity_desktop_lock_use_sak = false; // If SAK is enabled with unmanaged windows, the SAK dialog will never close and will "burn in" the screen + trinity_desktop_lock_delay_screensaver_start = false; // If trinity_desktop_lock_delay_screensaver_start is true with unmanaged windows, the lock dialog may never appear } delete tdmconfig;