clear dstoffset when DSTOffsetRequired is true (#28654)

Co-authored-by: C Freeman <[email protected]>
project-chip · Feb 1, 2024 · 81aaff7 · 81aaff7
1 parent b744836
commit 81aaff7
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/src/app/clusters/time-synchronization-server/time-synchronization-server.cpp b/src/app/clusters/time-synchronization-server/time-synchronization-server.cpp
@@ -925,19 +925,24 @@ bool emberAfTimeSynchronizationClusterSetTimeZoneCallback(
         }
         else
         {
-            TimeState dstState = TimeSynchronizationServer::Instance().UpdateDSTOffsetState();
-            TimeSynchronizationServer::Instance().ClearDSTOffset();
-            if (dstState == TimeState::kActive || dstState == TimeState::kChanged)
-            {
-                emitDSTStatusEvent(commandPath.mEndpointId, false);
-            }
             response.DSTOffsetRequired = true;
         }
     }
     else
     {
         response.DSTOffsetRequired = true;
     }
+
+    if (response.DSTOffsetRequired)
+    {
+        TimeState dstState = TimeSynchronizationServer::Instance().UpdateDSTOffsetState();
+        TimeSynchronizationServer::Instance().ClearDSTOffset();
+        if (dstState == TimeState::kActive || dstState == TimeState::kChanged)
+        {
+            emitDSTStatusEvent(commandPath.mEndpointId, false);
+        }
+    }
+
     commandObj->AddResponse(commandPath, response);
     return true;
 }