From 1d97d914f1de0404b5b4db1bfdeff35ed94ea422 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Tue, 3 Nov 2020 10:57:26 -0500
Subject: InstanceManager now returns new Instance struct instead of instance
 name moved most of the figuring out of instance parameters from
 InstanceManager to Instance, separated all the ui from it and put it in
 main.cpp added ways to show single pages in the create instance dialog so
 they can be used when info is missing

---
 src/processrunner.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'src/processrunner.cpp')

diff --git a/src/processrunner.cpp b/src/processrunner.cpp
index a0e74f47..8ee0914b 100644
--- a/src/processrunner.cpp
+++ b/src/processrunner.cpp
@@ -588,11 +588,14 @@ ProcessRunner& ProcessRunner::setFromShortcut(const MOShortcut& shortcut)
 {
   const auto currentInstance = InstanceManager::instance().currentInstance();
 
-  if (shortcut.hasInstance() && shortcut.instance() != currentInstance) {
-    throw std::runtime_error(
-      QString("Refusing to run executable from different instance %1:%2")
-      .arg(shortcut.instance(),shortcut.executable())
-      .toLocal8Bit().constData());
+  if (currentInstance)
+  {
+    if (shortcut.hasInstance() && shortcut.instance() != currentInstance->name()) {
+      throw std::runtime_error(
+        QString("Refusing to run executable from different instance %1:%2")
+        .arg(shortcut.instance(),shortcut.executable())
+        .toLocal8Bit().constData());
+    }
   }
 
   const Executable& exe = m_core.executablesList()->get(shortcut.executable());
-- 
cgit v1.3.1