diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2015-04-08 15:27:25 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2015-04-14 02:27:25 +0200 |
| commit | 0621ed70db1176471ce992b8eeb4d32d90f2f547 (patch) | |
| tree | 619c39131574153080b05877a701bf5f5af2b75c /kdesktop/krootwm.cc | |
| parent | 6dd6500446c3cd6e9ac0a4d980f596d8bb67d7d0 (diff) | |
| download | tdebase-0621ed70db1176471ce992b8eeb4d32d90f2f547.tar.gz tdebase-0621ed70db1176471ce992b8eeb4d32d90f2f547.zip | |
Eliminate usleep() loop during kdesktop startup
Do not switch desktops if lock fails to engage
(cherry picked from commit 751c96f9b1fc01675a1a9d34831104f98adfd84f)
Diffstat (limited to 'kdesktop/krootwm.cc')
| -rw-r--r-- | kdesktop/krootwm.cc | 4 |
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(); |