summaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorisanae <14251494+isanae@users.noreply.github.com>2020-07-24 09:25:02 -0400
committerisanae <14251494+isanae@users.noreply.github.com>2020-11-03 11:39:04 -0500
commit2cb5c21b8e15b02a09144ff6c1ab11e87879a420 (patch)
tree1831209831543f7092f71e84dd5438ed0653c2a1 /src/main.cpp
parentebbc8ed60c606b1b76fcea36eb2bd5db6373f7f0 (diff)
fixed settings doing weird stuff with multiple instances
sort games by name added intro and confirmation pages
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp10
1 files changed, 6 insertions, 4 deletions
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();