leave layers in use

synapse/cortex.py

@@ -4538,16 +4538,24 @@ async def _delViewWithLayer(self, viewiden, layriden, nexsitem, newparent=None):
         if newparent is not None:
             newview = self.views.get(newparent)
 
-        for cview in self.views.values():
-            if cview.parent is not None and cview.parent.iden == viewiden:
+        layrinuse = False
+        for view in self.viewsbylayer[layriden]:
+            if not view.isForkOf(viewiden):
+                layrinuse = True
+                continue
+
+            view.layers = [lyr for lyr in view.layers if lyr.iden != layriden]
+            await view.info.set('layers', [lyr.iden for lyr in view.layers])
+
+            if view.parent.iden == viewiden:
                 if newparent is None:
-                    cview.parent = None
-                    await cview.info.pop('parent')
+                    view.parent = None
+                    await view.info.pop('parent')
                 else:
-                    cview.parent = newview
-                    await cview.info.set('parent', newparent)
+                    view.parent = newview
+                    await view.info.set('parent', newparent)
 
-        if (layr := self.layers.get(layriden)) is not None:
+        if not layrinuse and (layr := self.layers.get(layriden)) is not None:
             del self.layers[layriden]
 
             for pdef in layr.layrinfo.get('pushs', {}).values():
@@ -4566,11 +4574,6 @@ async def _delViewWithLayer(self, viewiden, layriden, nexsitem, newparent=None):
 
             layr.deloffs = nexsitem[0]
 
-        for cview in self.views.values():
-            if layr in cview.layers:
-                cview.layers.remove(layr)
-                await cview.info.set('layers', [lyr.iden for lyr in cview.layers])
-
     async def delView(self, iden):
         view = self.views.get(iden)
         if view is None: