From 48274f33579076711c0475e84c7adf68c52df733 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Fri, 12 Feb 2021 03:22:52 -0500
Subject: - renamed instance::name() to displayName() to reduce confusion with
 portable instances - better errors when running incorrect shortcuts - fixed
 shortcuts being created with moshortcut://Portable:exe instead of an empty
 instance name for portable instances

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

(limited to 'src/moapplication.cpp')

diff --git a/src/moapplication.cpp b/src/moapplication.cpp
index 6d21745e..11053e66 100644
--- a/src/moapplication.cpp
+++ b/src/moapplication.cpp
@@ -392,10 +392,14 @@ void MOApplication::externalMessage(const QString& message)
 
   if (moshortcut.isValid()) {
     if(moshortcut.hasExecutable()) {
-      m_core->processRunner()
-        .setFromShortcut(moshortcut)
-        .setWaitForCompletion(ProcessRunner::TriggerRefresh)
-        .run();
+      try {
+        m_core->processRunner()
+          .setFromShortcut(moshortcut)
+          .setWaitForCompletion(ProcessRunner::TriggerRefresh)
+          .run();
+      } catch(std::exception&) {
+        // user was already warned
+      }
     }
   } else if (isNxmLink(message)) {
     MessageDialog::showMessage(tr("Download started"), qApp->activeWindow(), false);
@@ -414,11 +418,11 @@ void MOApplication::externalMessage(const QString& message)
     if (auto i=cl.instance()) {
       const auto ci = InstanceManager::singleton().currentInstance();
 
-      if (*i != ci->name()) {
+      if (*i != ci->displayName()) {
         reportError(tr(
           "This shortcut or command line is for instance '%1', but the current "
           "instance is '%2'.")
-            .arg(*i).arg(ci->name()));
+            .arg(*i).arg(ci->displayName()));
 
         return;
       }
-- 
cgit v1.3.1