From 92d1f764023e933f1767335d074299230ac23a3f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 12 Apr 2015 22:32:28 -0500 Subject: [PATCH] Handle screen locking internally on user switch This removes an external dcop call --- kdesktop/krootwm.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kdesktop/krootwm.cc b/kdesktop/krootwm.cc index 72b9f0f5d..6ca1862b2 100644 --- a/kdesktop/krootwm.cc +++ b/kdesktop/krootwm.cc @@ -872,7 +872,11 @@ void KRootWm::slotPopulateSessions() void KRootWm::slotSessionActivated( int ent ) { if (ent > 0 && !sessionsMenu->isItemChecked( ent )) { - DM().lockSwitchVT( ent ); + m_pSaver->lockScreen(); + if (!m_pSaver->waitForLockEngage()) { + return; + } + DM().switchVT( ent ); } }