From 694675470ec33d0e32cef7ea7e454de2ae1ab315 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Tue, 8 Jul 2025 10:40:54 +1000
Subject: [PATCH] Map parent studio after creation (#5996)

---
 ui/v2.5/src/components/Tagger/context.tsx | 27 +++++++++++++++++------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/ui/v2.5/src/components/Tagger/context.tsx b/ui/v2.5/src/components/Tagger/context.tsx
index 9b1e996de..434a47cce 100644
--- a/ui/v2.5/src/components/Tagger/context.tsx
+++ b/ui/v2.5/src/components/Tagger/context.tsx
@@ -680,15 +680,28 @@ export const TaggerContext: React.FC = ({ children }) => {
           return r;
         }
 
+        let resultStudio = r.studio;
+        if (resultStudio.name === studio.name) {
+          resultStudio = {
+            ...resultStudio,
+            stored_id: studioID,
+          };
+        }
+
+        // #5821 - set the stored_id of the parent studio if it matches too
+        if (resultStudio.parent?.name === studio.name) {
+          resultStudio = {
+            ...resultStudio,
+            parent: {
+              ...resultStudio.parent,
+              stored_id: studioID,
+            },
+          };
+        }
+
         return {
           ...r,
-          studio:
-            r.studio.name === studio.name
-              ? {
-                  ...r.studio,
-                  stored_id: studioID,
-                }
-              : r.studio,
+          studio: resultStudio,
         };
       });