summaryrefslogtreecommitdiff
diff options
authorAndrea Azzarone <azzaronea@gmail.com>2014-03-21 20:34:31 +0100
committerAndrea Azzarone <azzaronea@gmail.com>2014-03-21 20:34:31 +0100
commit888682ae5202ba251e9d4436648c112f8fd0d916 (patch)
tree3f71a2e361fc485e7652c925f92367f8dd57277a
parenta2a3b719851a4f65a939243b5c958011f93ec60b (diff)
Release the timeout on unlock.
(bzr r3736.1.1)
-rw-r--r--lockscreen/LockScreenController.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/lockscreen/LockScreenController.cpp b/lockscreen/LockScreenController.cpp
index dabe12948..6904ee075 100644
--- a/lockscreen/LockScreenController.cpp
+++ b/lockscreen/LockScreenController.cpp
@@ -231,6 +231,8 @@ void Controller::ShowShields()
void Controller::OnUnlockRequested()
{
+ lockscreen_timeout_.release();
+
if (!IsLocked())
return;