diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2015-04-13 00:48:27 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2015-04-14 02:27:28 +0200 |
| commit | 2b0e13211cc2ce86926cfe133ce29df3a6141e91 (patch) | |
| tree | 3dfcf227e926b9637e76d178914447d4e386d722 /kdesktop/krootwm.cc | |
| parent | 7188f7044b0bb11a24754cfa83d39ecc0721bbdb (diff) | |
| download | tdebase-2b0e13211cc2ce86926cfe133ce29df3a6141e91.tar.gz tdebase-2b0e13211cc2ce86926cfe133ce29df3a6141e91.zip | |
Ensure desktop is completely hidden before sending fullyOnline()
Do not block kdesktop process while waiting for kdesktop_lock to engage prior to VT switch/new VT requests made from within kdesktop
(cherry picked from commit 78d33c29157b8e3a0b81c36f73ec5f958439565c)
Diffstat (limited to 'kdesktop/krootwm.cc')
| -rw-r--r-- | kdesktop/krootwm.cc | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/kdesktop/krootwm.cc b/kdesktop/krootwm.cc index 6ca1862b2..c14d1326c 100644 --- a/kdesktop/krootwm.cc +++ b/kdesktop/krootwm.cc @@ -83,7 +83,6 @@ KRootWm::KRootWm(SaverEngine* _saver, KDesktop* _desktop) : TQObject(_desktop), customMenu2 = 0; m_configDialog = 0; - // Creates the new menu menuBar = 0; // no menubar yet menuNew = 0; @@ -825,7 +824,6 @@ void KRootWm::slotCascadeWindows() { void KRootWm::slotLock() { m_pSaver->lockScreen(); - m_pSaver->waitForLockEngage(); } @@ -872,11 +870,7 @@ void KRootWm::slotPopulateSessions() void KRootWm::slotSessionActivated( int ent ) { if (ent > 0 && !sessionsMenu->isItemChecked( ent )) { - m_pSaver->lockScreen(); - if (!m_pSaver->waitForLockEngage()) { - return; - } - DM().switchVT( ent ); + m_pSaver->lockScreenAndSwitchSession(ent); } } @@ -914,13 +908,11 @@ void KRootWm::doNewSession( bool lock ) return; if (lock) { - m_pSaver->lockScreen(); - if (!m_pSaver->waitForLockEngage()) { - return; - } + m_pSaver->lockScreenAndDoNewSession(); + } + else { + DM().startReserve(); } - - DM().startReserve(); } void KRootWm::slotMenuItemActivated(int /* item */ ) |