From 2cb5c21b8e15b02a09144ff6c1ab11e87879a420 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Fri, 24 Jul 2020 09:25:02 -0400
Subject: fixed settings doing weird stuff with multiple instances sort games
 by name added intro and confirmation pages

---
 src/main.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/main.cpp')

diff --git a/src/main.cpp b/src/main.cpp
index 71fb0bbd..58e22466 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -270,6 +270,8 @@ std::optional<int> handleCommandLine(
   return {};
 }
 
+void openInstanceManager(PluginContainer& pc, QWidget* parent);
+
 int runApplication(
   MOApplication &application, const cl::CommandLine& cl,
   SingleInstance &instance, const QString &dataPath)
@@ -298,8 +300,9 @@ int runApplication(
 
   try
   {
-    Settings settings(dataPath + "/" + QString::fromStdWString(AppConfig::iniFileName()));
-    settings.setGlobalInstance();
+    Settings settings(
+      dataPath + "/" + QString::fromStdWString(AppConfig::iniFileName()),
+      true);
 
     log::getDefault().setLevel(settings.diagnostics().logLevel());
 
@@ -434,8 +437,7 @@ int runApplication(
 
       QTimer::singleShot(std::chrono::milliseconds(1), [&]
       {
-        InstanceManagerDialog dlg(*pluginContainer, &mainWindow);
-        dlg.exec();
+        openInstanceManager(*pluginContainer, &mainWindow);
       });
 
       res = application.exec();
-- 
cgit v1.3.1