fix merge conflict

NickHugi · Mar 14, 2024 · ebf8f08 · ebf8f08
1 parent bcec9e4
commit ebf8f08
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Tools/HolocronToolset/src/toolset/gui/windows/main.py b/Tools/HolocronToolset/src/toolset/gui/windows/main.py
@@ -950,7 +950,7 @@ def prepare_task() -> tuple[list[QStandardItem] | None, ...]:
             return
         print("Loading core installation resources into UI...")
         self.ui.coreWidget.setResources(self.active.chitin_resources())
-        moduleItems, overrideItems, saveItems, textureItems = loader.value
+        moduleItems, overrideItems, textureItems = loader.value
         self.ui.modulesWidget.setSections(moduleItems)
         self.ui.overrideWidget.setSections(overrideItems)
         self.ui.texturesWidget.setSections(textureItems)
@@ -968,6 +968,7 @@ def prepare_task() -> tuple[list[QStandardItem] | None, ...]:
         self.dogObserver.start()
         print("Loader task completed.")
         self.settings.installations()[name].path = path
+        self.installations[name] = self.active
 
     def _extractResource(self, resource: FileResource, filepath: os.PathLike | str, loader: AsyncBatchLoader):
         """Extracts a resource file from a FileResource object.