diff options
| author | Michele Calgaro <[email protected]> | 2016-03-13 07:02:13 +0100 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2016-03-13 07:04:14 +0100 |
| commit | 6c453ce30ecea780f7a03ecfb088b602c22e1548 (patch) | |
| tree | 24346ebbba5c32c9c9ebb9afd65f23251ffe3a7a /kdesktop/lockeng.cc | |
| parent | 8425cf891461e5f8bb6938f3a9cae77f9ed4611f (diff) | |
| download | tdebase-6c453ce30ecea780f7a03ecfb088b602c22e1548.tar.gz tdebase-6c453ce30ecea780f7a03ecfb088b602c22e1548.zip | |
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 <[email protected]>
(cherry picked from commit ab959b43ca0d41104fc828e0a0b57cc8a6c5108c)
Diffstat (limited to 'kdesktop/lockeng.cc')
| -rw-r--r-- | kdesktop/lockeng.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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. |