summaryrefslogtreecommitdiffstats
path: root/kdesktop/lock/main.cc
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-04-26 19:02:52 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-04-26 19:02:52 -0500
commit5d286832f272ba6d1a955d4b952f34ed374bbf30 (patch)
tree2a30a3e68e0659551c8e17bcb384ff6f6c9839e3 /kdesktop/lock/main.cc
parent09adc49d974c8f046f82d5ef907898a8892c8e3b (diff)
downloadtdebase-5d286832f272ba6d1a955d4b952f34ed374bbf30.tar.gz
tdebase-5d286832f272ba6d1a955d4b952f34ed374bbf30.zip
Fix corner case lock dialog hang
Diffstat (limited to 'kdesktop/lock/main.cc')
-rw-r--r--kdesktop/lock/main.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc
index 4dc9f1e0..98f59a95 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;