Validate if the Current Group = RemovedGroup or check if CurrentScene…

… is in RemovedGroup before invalidating the scene.
project-chip · Aug 7, 2023 · 3564e53 · 3564e53
1 parent ed545c4
commit 3564e53
Showing 1 changed file with 13 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,19 @@ 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);
+
+    chip::SceneId * currentScene;
+    Attributes::CurrentScene::Get(aEndpointId,currentScene);
+
+    //Validate if the Current Group = RemovedGroup or check if CurrentScene is in RemovedGroup before invalidating the scene.
+    SceneTableEntry entry;
+    if(aGroupId == *currentGroup || sceneTable->GetSceneTableEntry(aFabricIx,SceneStorageId(*currentScene,*currentGroup),entry) == CHIP_NO_ERROR)
+    {
+        MakeSceneInvalid(aEndpointId);
+    }
+
 
     VerifyOrReturn(nullptr != mGroupProvider);
     if (0 != aGroupId && !mGroupProvider->HasEndpoint(aFabricIx, aGroupId, aEndpointId))