Validate if the Current Group = RemovedGroup before invalidating scene (

#28565) * Validate if the Current Group = RemovedGroup or check if CurrentScene is in RemovedGroup before invalidating the scene. * Fix nonsensical code * ditto * ditto bis * restyle * Remove check that was not specification compliant * Cleanup * Update src/app/clusters/scenes-server/scenes-server.cpp Co-authored-by: Boris Zbarsky <[email protected]> --------- Co-authored-by: Boris Zbarsky <[email protected]>
project-chip · Aug 16, 2023 · 70bf3bc · 70bf3bc
1 parent d179251
commit 70bf3bc
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/app/clusters/scenes-server/scenes-server.cpp b/src/app/clusters/scenes-server/scenes-server.cpp
@@ -510,7 +510,15 @@ void ScenesServer::GroupWillBeRemoved(FabricIndex aFabricIx, EndpointId aEndpoin
     SceneTable * sceneTable = scenes::GetSceneTableImpl(aEndpointId);
     VerifyOrReturn(nullptr != sceneTable);
 
-    MakeSceneInvalid(aEndpointId);
+    chip::GroupId currentGroup;
+    Attributes::CurrentGroup::Get(aEndpointId, &currentGroup);
+
+    // If currentGroup is what is being removed, we can't possibly still have a valid scene,
+    // because the scene we have (if any) will also be removed.
+    if (aGroupId == currentGroup)
+    {
+        MakeSceneInvalid(aEndpointId);
+    }
 
     VerifyOrReturn(nullptr != mGroupProvider);
     if (0 != aGroupId && !mGroupProvider->HasEndpoint(aFabricIx, aGroupId, aEndpointId))