aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamarque V. Souza <lamarque@gmail.com>2011-04-09 05:44:47 (GMT)
committerLamarque V. Souza <lamarque@gmail.com>2011-04-09 05:44:47 (GMT)
commit5c47f16d67065e239c380cc369a1da854acef19a (patch)
tree0f47881fcb7152fa6edb3c4263625762cbbef4b9
parent28b79d8d04cce4d0a0899cadcc8fe6fd69d38e01 (diff)
Fix SimulateUserActivity not working for a second when resuming from
ram/disk. The problem is in krunner/lock/lockprocess.cc, LockProcess::lock(...), lines: mBusy = true; ... QTimer::singleShot(1000, this, SLOT(slotDeadTimePassed())); The "dead-time" makes LockProcess ignores any SimulateUserActivity requests during that one second-time. I have added "mInitialLock = true" in LockProcess::signalPipeSignal() to simulate the "--showunlock" parameter after the one second-time. BUG: 269737 FIXED-IN: 4.6.3
-rw-r--r--krunner/lock/lockprocess.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/krunner/lock/lockprocess.cc b/krunner/lock/lockprocess.cc
index bb4009e..0dbedbd 100644
--- a/krunner/lock/lockprocess.cc
+++ b/krunner/lock/lockprocess.cc
@@ -310,6 +310,8 @@ void LockProcess::signalPipeSignal()
if (tmp == 'T') {
quitSaver();
} else if (tmp == '1') {
+ // In case SimulateUserActivity (SIGUSR1) is called during the dead-time (mBusy == true).
+ mInitialLock = true;
if (!mBusy && mDialogs.isEmpty()) {
mBusy = true;
quit();