Don't try to relock the lock if it's locked when the auto-relock time…

…r fires. (#24769) Fixes #24766
project-chip · Jul 21, 2023 · 04d7213 · 04d7213
1 parent 280ed56
commit 04d7213
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/src/app/clusters/door-lock-server/door-lock-server.cpp b/src/app/clusters/door-lock-server/door-lock-server.cpp
@@ -3801,8 +3801,19 @@ void MatterDoorLockClusterServerAttributeChangedCallback(const app::ConcreteAttr
 
 void DoorLockServer::DoorLockOnAutoRelockCallback(chip::EndpointId endpointId)
 {
-    emberAfDoorLockClusterPrintln("Door Auto relock timer expired. Locking...");
     emberEventControlSetInactive(&DoorLockServer::Instance().AutolockEvent);
-    DoorLockServer::Instance().SetLockState(endpointId, DlLockState::kLocked, OperationSourceEnum::kAuto);
-    emberAfPluginDoorLockOnAutoRelock(endpointId);
+
+    Nullable<DlLockState> lockState;
+    if (Attributes::LockState::Get(endpointId, lockState) != EMBER_ZCL_STATUS_SUCCESS || lockState.IsNull() ||
+        lockState.Value() != DlLockState::kLocked)
+    {
+        emberAfDoorLockClusterPrintln("Door Auto relock timer expired. %s", "Locking...");
+
+        DoorLockServer::Instance().SetLockState(endpointId, DlLockState::kLocked, OperationSourceEnum::kAuto);
+        emberAfPluginDoorLockOnAutoRelock(endpointId);
+    }
+    else
+    {
+        emberAfDoorLockClusterPrintln("Door Auto relock timer expired. %s", "Already locked.");
+    }
 }