Merge branch 'mer1663' into 'master'

[devicelock] Fix state not being initialized correctly if no code is set. Contributes to MER#1663 See merge request !6
sailfishos · Jan 31, 2017 · 925fc5e · 925fc5e
2 parents ce432f4 + 1818995
commit 925fc5e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/src/nemo-devicelock/host/hostdevicelock.cpp b/src/nemo-devicelock/host/hostdevicelock.cpp
@@ -105,7 +105,6 @@ bool HostDeviceLock::isUnlocking() const
 
 void HostDeviceLock::unlock()
 {
-    qDebug() << "Unlock" << m_state << state();
     if (m_state != Idle || state() == DeviceLock::Unlocked) {
         return;
     }

diff --git a/src/nemo-devicelock/host/mcedevicelock.cpp b/src/nemo-devicelock/host/mcedevicelock.cpp
@@ -198,6 +198,7 @@ static const char *reprLockState(bool locked)
 void MceDeviceLock::init()
 {
     setLocked(automaticLocking() >= 0);
+    stateChanged();
 }
 
 /** Evaluate devicelock state we should be in