summaryrefslogtreecommitdiffstats
path: root/kdesktop/krootwm.cc
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2015-04-08 15:27:25 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2015-04-08 15:27:25 -0500
commit751c96f9b1fc01675a1a9d34831104f98adfd84f (patch)
tree73c9105e26780f965baa7a1314a59035f792c0a5 /kdesktop/krootwm.cc
parenta17bfb0b96f5b255f41d03c3143d1eca04c88e36 (diff)
downloadtdebase-751c96f9b1fc01675a1a9d34831104f98adfd84f.tar.gz
tdebase-751c96f9b1fc01675a1a9d34831104f98adfd84f.zip
Eliminate usleep() loop during kdesktop startup
Do not switch desktops if lock fails to engage
Diffstat (limited to 'kdesktop/krootwm.cc')
-rw-r--r--kdesktop/krootwm.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/kdesktop/krootwm.cc b/kdesktop/krootwm.cc
index d12e024ab..72b9f0f5d 100644
--- a/kdesktop/krootwm.cc
+++ b/kdesktop/krootwm.cc
@@ -911,7 +911,9 @@ void KRootWm::doNewSession( bool lock )
if (lock) {
m_pSaver->lockScreen();
- m_pSaver->waitForLockEngage();
+ if (!m_pSaver->waitForLockEngage()) {
+ return;
+ }
}
DM().startReserve();