Fix merge issues

ModOrganizer2 · Sep 5, 2023 · 348e256 · 348e256
1 parent bbd7341
commit 348e256
Show file tree

Hide file tree

Showing 3 changed files with 1,962 additions and 1,239 deletions.
diff --git a/src/categories.cpp b/src/categories.cpp
@@ -34,21 +34,21 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 
 using namespace MOBase;
 
+CategoryFactory* CategoryFactory::s_Instance = nullptr;
+
 QString CategoryFactory::categoriesFilePath()
 {
   return qApp->property("dataPath").toString() + "/categories.dat";
 }
 
-CategoryFactory::CategoryFactory()
-
-QString CategoryFactory::nexusMappingFilePath()
+CategoryFactory::CategoryFactory() : QObject()
 {
-  return qApp->property("dataPath").toString() + "/nexuscatmap.dat";
+  atexit(&cleanup);
 }
 
-CategoryFactory::CategoryFactory() : QObject()
+QString CategoryFactory::nexusMappingFilePath()
 {
-  atexit(&cleanup);
+  return qApp->property("dataPath").toString() + "/nexuscatmap.dat";
 }
 
 void CategoryFactory::loadCategories()
@@ -143,7 +143,6 @@ void CategoryFactory::loadCategories()
   if (needLoad) loadDefaultCategories();
 }
 
-
 CategoryFactory* CategoryFactory::instance()
 {
   static CategoryFactory s_Instance;
@@ -181,6 +180,11 @@ void CategoryFactory::setParents()
   }
 }
 
+void CategoryFactory::cleanup()
+{
+  delete s_Instance;
+  s_Instance = nullptr;
+}
 
 void CategoryFactory::saveCategories()
 {

diff --git a/src/categories.h b/src/categories.h
@@ -226,7 +226,11 @@ class CategoryFactory : public QObject {
 
   void setParents();
 
+  static void cleanup();
+
 private:
+  static CategoryFactory* s_Instance;
+
   std::vector<Category> m_Categories;
   std::map<int, unsigned int> m_IDMap;
   std::map<int, NexusCategory> m_NexusMap;