From 4eed63767cedb0d96b116c4b9233405ca93e5541 Mon Sep 17 00:00:00 2001 From: zecke Date: Tue, 12 Oct 2004 14:59:06 +0000 Subject: -Skip showing the Security screen if onResume or onPoweron is set to false --- diff --git a/libopie2/opiesecurity/multiauthpassword.cpp b/libopie2/opiesecurity/multiauthpassword.cpp index 8eda554..6c8944e 100644 --- a/libopie2/opiesecurity/multiauthpassword.cpp +++ b/libopie2/opiesecurity/multiauthpassword.cpp @@ -85,7 +85,7 @@ bool MultiauthPassword::needToAuthenticate(bool at_poweron) */ void MultiauthPassword::authenticate(int lockMode) { - /** + /** * \par Conditions * * If lockMode is an If, it's conditional: @@ -99,9 +99,9 @@ void MultiauthPassword::authenticate(int lockMode) Config cfg("Security"); cfg.setGroup("Misc"); if ( ( - (lockMode == IfPowerOn) && cfg.readBoolEntry("onStart", false) + (lockMode == IfPowerOn) && !cfg.readBoolEntry("onStart", false) ) || ( - (lockMode == IfResume) && cfg.readBoolEntry("onResume", false) + (lockMode == IfResume) && !cfg.readBoolEntry("onResume", false) ) ) return; } @@ -114,7 +114,7 @@ void MultiauthPassword::authenticate(int lockMode) * people escape. */ bool allowByPass = false; - + if (lockMode == TestNow) allowByPass = true; -- cgit v0.9.0.2