From 658491b8984a4e31607c9cebeaca0fdec77d50e2 Mon Sep 17 00:00:00 2001
From: Puck Meerburg <puck@puckipedia.nl>
Date: Tue, 19 Nov 2013 19:41:53 +0000
Subject: [PATCH] Fixed #9952.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Delay of the password lock for a few seconds

Signed-off-by: Jérôme Duval <jerome.duval@gmail.com>
---
 src/bin/screen_blanker/ScreenBlanker.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/bin/screen_blanker/ScreenBlanker.cpp b/src/bin/screen_blanker/ScreenBlanker.cpp
index 8a5aee732f..83fdc6ac24 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();