From 6c453ce30ecea780f7a03ecfb088b602c22e1548 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 13 Mar 2016 07:02:13 +0100 Subject: Fixed desktop locking code. This relates to bug 2603 and fixes the locking-after-suspend issue when the screensaver is also enabled. Signed-off-by: Michele Calgaro (cherry picked from commit ab959b43ca0d41104fc828e0a0b57cc8a6c5108c) --- kdesktop/lockeng.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kdesktop/lockeng.cc') diff --git a/kdesktop/lockeng.cc b/kdesktop/lockeng.cc index 600573f27..bb363dcb8 100644 --- a/kdesktop/lockeng.cc +++ b/kdesktop/lockeng.cc @@ -202,7 +202,7 @@ void SaverEngine::lock() void SaverEngine::lockScreen(bool DCOP) { bool ok = true; - if (mState != Saving) + if (mState == Waiting) { ok = startLockProcess( ForceLock ); // It takes a while for kdesktop_lock to start and lock the screen. -- cgit v1.2.1