Fixing some issues

mr-phazer · Nov 24, 2024 · 913d8a0 · 913d8a0
1 parent 6af4ada
commit 913d8a0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/Shared/SharedCore/PackFiles/PackFileService.cs b/Shared/SharedCore/PackFiles/PackFileService.cs
@@ -51,6 +51,11 @@ public void AddContainer(PackFileContainer container, bool setToMainPackIfFirst
                 }
             }
 
+            AddContainerInternal(container, setToMainPackIfFirst);  
+        }
+
+        void AddContainerInternal(PackFileContainer container, bool setToMainPackIfFirst = false)
+        {
             _packFileContainers.Add(container);
             _globalEventHub?.PublishGlobalEvent(new PackFileContainerAddedEvent(container));
 
@@ -67,11 +72,10 @@ public PackFileContainer CreateNewPackFileContainer(string name, PackFileCAType
             var newPackFile = new PackFileContainer(name)
             {
                 Header = new PFHeader("PFH5", type),
-
             };
-            AddContainer(newPackFile);
-            if (setEditablePack)
-                SetEditablePack(newPackFile);
+
+            AddContainerInternal(newPackFile, setEditablePack);
+
             return newPackFile;
         }
 

diff --git a/Testing/E2EVerification/Shared/AssetEditorTestRunner.cs b/Testing/E2EVerification/Shared/AssetEditorTestRunner.cs
@@ -46,7 +46,7 @@ public AssetEditorTestRunner(GameTypeEnum gameEnum = GameTypeEnum.Warhammer3, bo
             var loader = EditorServiceProvider.ServiceProvider.GetRequiredService<IPackFileContainerLoader>();
             var container = loader.Load(path);
             container.IsCaPackFile = true;
-            PackFileService.AddContainer(container, false);
+            PackFileService.AddContainer(container);
 
             if (createOutputPackFile)
                 return PackFileService.CreateNewPackFileContainer("TestOutput", PackFileCAType.MOD, true);
@@ -58,7 +58,7 @@ public AssetEditorTestRunner(GameTypeEnum gameEnum = GameTypeEnum.Warhammer3, bo
             var loader = EditorServiceProvider.ServiceProvider.GetRequiredService<IPackFileContainerLoader>();
             var container = loader.LoadSystemFolderAsPackFileContainer(path);
             container.IsCaPackFile = true;
-            PackFileService.AddContainer(container, false);
+            PackFileService.AddContainer(container);
 
             if (createOutputPackFile)
                 return PackFileService.CreateNewPackFileContainer("TestOutput", PackFileCAType.MOD, true);