replaced #pragma once by ifdefs

changed pointer to ref to NexusInterface
on_actionChange_Game_triggered() now creates the dialog itself instead of calling test code
fixed broken command line options, they'd be reset before they were used
removed useless explicit

1 files changed, 7 insertions, 7 deletions

diff --git a/src/main.cpp b/src/main.cpp
index bd7f8303..8f7af77d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -650,13 +650,6 @@ int doOneRun(
   // resets things when MO is "restarted"
   resetForRestart(cl);
 
-  if (cl.instance())
-    InstanceManager::instance().overrideInstance(*cl.instance());
-
-  if (cl.profile()) {
-    InstanceManager::instance().overrideProfile(*cl.profile());
-  }
-
   auto currentInstance = InstanceManager::instance().currentInstance();
 
   if (!currentInstance)
@@ -707,6 +700,13 @@ int main(int argc, char *argv[])
 
   tt.stop();
 
+  if (cl.instance())
+    InstanceManager::instance().overrideInstance(*cl.instance());
+
+  if (cl.profile()) {
+    InstanceManager::instance().overrideProfile(*cl.profile());
+  }
+
   for (;;)
   {
     const auto r = doOneRun(cl, application, instance);