[haiku-commits] haiku: hrev46393 - src/bin/screen_blanker
- From: korli@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 19 Nov 2013 20:40:17 +0100 (CET)
hrev46393 adds 1 changeset to branch 'master'
old head: 72950e7c15c1f5b88a85fd35dab37fe058f4605a
new head: 658491b8984a4e31607c9cebeaca0fdec77d50e2
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=658491b+%5E72950e7
----------------------------------------------------------------------------
658491b: Fixed #9952.
* Delay of the password lock for a few seconds
Signed-off-by: Jérôme Duval <jerome.duval@xxxxxxxxx>
[ Puck Meerburg <puck@xxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev46393
Commit: 658491b8984a4e31607c9cebeaca0fdec77d50e2
URL: http://cgit.haiku-os.org/haiku/commit/?id=658491b
Author: Puck Meerburg <puck@xxxxxxxxxxxxx>
Date: Tue Nov 19 19:41:53 2013 UTC
Committer: Jérôme Duval <jerome.duval@xxxxxxxxx>
Commit-Date: Tue Nov 19 19:34:06 2013 UTC
Ticket: https://dev.haiku-os.org/ticket/9952
----------------------------------------------------------------------------
1 file changed, 8 insertions(+), 5 deletions(-)
src/bin/screen_blanker/ScreenBlanker.cpp | 13 ++++++++-----
----------------------------------------------------------------------------
diff --git a/src/bin/screen_blanker/ScreenBlanker.cpp
b/src/bin/screen_blanker/ScreenBlanker.cpp
index 8a5aee7..83fdc6a 100644
--- a/src/bin/screen_blanker/ScreenBlanker.cpp
+++ b/src/bin/screen_blanker/ScreenBlanker.cpp
@@ -274,11 +274,14 @@ ScreenBlanker::MessageReceived(BMessage* message)
bool
ScreenBlanker::QuitRequested()
{
- if (fSettings.LockEnable()
- && system_time() - fBlankTime > fSettings.PasswordTime()
- - fSettings.BlankTime()) {
- _ShowPasswordWindow();
- return false;
+ if (fSettings.LockEnable()) {
+ bigtime_t minTime = fSettings.PasswordTime() -
fSettings.BlankTime();
+ if (minTime == 0)
+ minTime = 5000000;
+ if (system_time() - fBlankTime > minTime) {
+ _ShowPasswordWindow();
+ return false;
+ }
}
_Shutdown();
Other related posts:
- » [haiku-commits] haiku: hrev46393 - src/bin/screen_blanker - korli
