summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2016-03-13 06:02:13 (GMT)
committer Michele Calgaro <michele.calgaro@yahoo.it>2016-03-13 06:02:13 (GMT)
commitab959b43ca0d41104fc828e0a0b57cc8a6c5108c (patch)
tree9c09a01f8dd70cbc7d3a9dabf7ab964022ffa0c1
parent71bd29a534261d3ac976a4f2fb2c953172d165b5 (diff)
downloadtdebase-ab959b43.zip
tdebase-ab959b43.tar.gz
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 <michele.calgaro@yahoo.it>
-rw-r--r--kdesktop/lockeng.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/kdesktop/lockeng.cc b/kdesktop/lockeng.cc
index 0c7558f..8aa6bb6 100644
--- a/kdesktop/lockeng.cc
+++ b/kdesktop/lockeng.cc
@@ -283,7 +283,7 @@ 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.