-rw-r--r-- | core/settings/security/security.cpp | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/core/settings/security/security.cpp b/core/settings/security/security.cpp index c4726b3..00ea105 100644 --- a/core/settings/security/security.cpp +++ b/core/settings/security/security.cpp | |||
@@ -113,3 +113,3 @@ void Security::show() | |||
113 | { | 113 | { |
114 | valid=FALSE; | 114 | //valid=FALSE; |
115 | setEnabled(FALSE); | 115 | setEnabled(FALSE); |
@@ -122,9 +122,13 @@ void Security::show() | |||
122 | } else { | 122 | } else { |
123 | QString pc = enterPassCode(tr("Enter passcode")); | 123 | |
124 | if ( pc != passcode ) { | 124 | if (!valid) // security passcode was not asked yet, so ask now |
125 | QMessageBox::critical(this, tr("Passcode incorrect"), | 125 | { |
126 | tr("The passcode entered is incorrect.\nAccess denied")); | 126 | QString pc = enterPassCode(tr("Enter passcode")); |
127 | reject(); | 127 | if ( pc != passcode ) { |
128 | return; | 128 | QMessageBox::critical(this, tr("Passcode incorrect"), |
129 | } | 129 | tr("The passcode entered is incorrect.\nAccess denied")); |
130 | reject(); | ||
131 | return; | ||
132 | } | ||
133 | } | ||
130 | } | 134 | } |
@@ -215,2 +219,3 @@ void Security::loadUsers ( void ) | |||
215 | } | 219 | } |
220 | |||
216 | void Security::toggleAutoLogin(bool val) | 221 | void Security::toggleAutoLogin(bool val) |
@@ -222,2 +227,6 @@ void Security::toggleAutoLogin(bool val) | |||
222 | } | 227 | } |
228 | |||
229 | |||
230 | |||
231 | |||
223 | void Security::setSyncNet(const QString& sn) | 232 | void Security::setSyncNet(const QString& sn) |
@@ -232,2 +241,3 @@ void Security::applySecurity() | |||
232 | if ( valid ) { | 241 | if ( valid ) { |
242 | <<<<<<< security.cpp | ||
233 | Config cfg("Security"); | 243 | Config cfg("Security"); |
@@ -264,2 +274,3 @@ void Security::applySecurity() | |||
264 | cfg.writeEntry("Mode", syncModeCombo->currentItem()+1 ); | 274 | cfg.writeEntry("Mode", syncModeCombo->currentItem()+1 ); |
275 | |||
265 | } | 276 | } |