summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-04-26 19:02:52 -0500
committerSlávek Banko <slavek.banko@axis.cz>2012-06-03 03:27:14 +0200
commitc65396ed7628fb0065c4ebe8061ba978cf1443fc (patch)
tree133af4c1e6197ad9362f0c9873e2c285c4015392
parent6db29f067a886035aa5f1c3d59c28b2917d3038d (diff)
downloadtdebase-c65396ed7628fb0065c4ebe8061ba978cf1443fc.tar.gz
tdebase-c65396ed7628fb0065c4ebe8061ba978cf1443fc.zip
Fix corner case lock dialog hang
(cherry picked from commit 5d286832f272ba6d1a955d4b952f34ed374bbf30)
-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 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;