Merge branch 'jb45370_fix_checking_code_twice' into 'master'

Do not check code twice. JB#45370 See merge request mer-core/nemo-qml-plugin-devicelock!38
sailfishos · Apr 18, 2019 · b65e698 · b65e698
2 parents 2b44347 + 7d42ec3
commit b65e698
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/nemo-devicelock/host/hostdevicelock.cpp b/src/nemo-devicelock/host/hostdevicelock.cpp
@@ -148,9 +148,10 @@ void HostDeviceLock::enterSecurityCode(const QString &code)
     case Idle:
         break;
     case Authenticating: {
-        switch (const int result = checkCode(code)) {
+        switch (const int result = unlockWithCode(code)) {
+        case Evaluating:
         case Success:
-            unlockFinished(unlockWithCode(code), Authenticator::SecurityCode);
+            unlockFinished(result, Authenticator::SecurityCode);
             break;
         case SecurityCodeExpired:
             m_state = EnteringNewSecurityCode;