1 files changed, 5 insertions, 5 deletions
diff --git a/src/moapplication.cpp b/src/moapplication.cpp
index 91cac2b1..6d21745e 100644
--- a/src/moapplication.cpp
+++ b/src/moapplication.cpp
@@ -183,7 +183,7 @@ void MOApplication::firstTimeSetup(MOMultiProcess& multiProcess)
     Qt::QueuedConnection);
 }
 
-int MOApplication::setup(MOMultiProcess& multiProcess)
+int MOApplication::setup(MOMultiProcess& multiProcess, bool forceSelect)
 {
   TimeThis tt("MOApplication setup()");
 
@@ -192,7 +192,7 @@ int MOApplication::setup(MOMultiProcess& multiProcess)
   MOBase::details::setPluginDataPath(OrganizerCore::pluginDataPath());
 
   // figuring out the current instance
-  m_instance = getCurrentInstance();
+  m_instance = getCurrentInstance(forceSelect);
   if (!m_instance) {
     return 1;
   }
@@ -398,7 +398,7 @@ void MOApplication::externalMessage(const QString& message)
         .run();
     }
   } else if (isNxmLink(message)) {
-    MessageDialog::showMessage(tr("Download started"), qApp->activeWindow());
+    MessageDialog::showMessage(tr("Download started"), qApp->activeWindow(), false);
     m_core->downloadRequestedNXM(message);
   } else {
     cl::CommandLine cl;
@@ -439,12 +439,12 @@ void MOApplication::externalMessage(const QString& message)
   }
 }
 
-std::unique_ptr<Instance> MOApplication::getCurrentInstance()
+std::unique_ptr<Instance> MOApplication::getCurrentInstance(bool forceSelect)
 {
   auto& m = InstanceManager::singleton();
   auto currentInstance = m.currentInstance();
 
-  if (!currentInstance)
+  if (forceSelect || !currentInstance)
   {
     // clear any overrides that might have been given on the command line
     m.clearOverrides();