Use single instance also for MO shortcuts

3 files changed, 15 insertions, 21 deletions

diff --git a/src/main.cpp b/src/main.cpp
index 9b2afecc..dbf41afb 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -121,21 +121,6 @@ bool bootstrap()
 }

 

 

-bool isNxmLink(const QString &link)

-{

-  return link.startsWith("nxm://", Qt::CaseInsensitive);

-}

-

-bool isMoShortcut(const QString &link)

-{

-  return link.startsWith("moshortcut://", Qt::CaseInsensitive);

-}

-

-QString moShortcutName(const QString &link)

-{

-  return link.mid(strlen("moshortcut://"));

-}

-

 static LONG WINAPI MyUnhandledExceptionFilter(struct _EXCEPTION_POINTERS *exceptionPtrs)

 {

   if ((exceptionPtrs->ExceptionRecord->ExceptionCode  < 0x80000000)      // non-critical

@@ -477,16 +462,16 @@ int runApplication(MOApplication &application, SingleInstance &instance,
     // if we have a command line parameter, it is either a nxm link or

     // a binary to start

     if (arguments.size() > 1) {

-      if (isMoShortcut(arguments.at(1))) {

+      if (OrganizerCore::isMoShortcut(arguments.at(1))) {

         try {

-          organizer.runShortcut(moShortcutName(arguments.at(1)));

+          organizer.runShortcut(OrganizerCore::moShortcutName(arguments.at(1)));

           return 0;

         } catch (const std::exception &e) {

           reportError(

             QObject::tr("failed to start shortcut: %1").arg(e.what()));

           return 1;

         }

-      } else if (isNxmLink(arguments.at(1))) {

+      } else if (OrganizerCore::isNxmLink(arguments.at(1))) {

         qDebug("starting download from command line: %s",

                qPrintable(arguments.at(1)));

         organizer.externalMessage(arguments.at(1));

@@ -579,8 +564,10 @@ int main(int argc, char *argv[])
 

   SingleInstance instance(forcePrimary);

   if (!instance.primaryInstance()) {

-    if ((arguments.size() == 2) && isNxmLink(arguments.at(1))) {

-      qDebug("not primary instance, sending download message");

+    if ((arguments.size() == 2)

+      && (OrganizerCore::isMoShortcut(arguments.at(1)) || OrganizerCore::isNxmLink(arguments.at(1))))

+    {

+      qDebug("not primary instance, sending shortcut/download message");

       instance.sendMessage(arguments.at(1));

       return 0;

     } else if (arguments.size() == 1) {

diff --git a/src/organizercore.cpp b/src/organizercore.cpp
index 116552df..bc0578b3 100644
--- a/src/organizercore.cpp
+++ b/src/organizercore.cpp
@@ -578,7 +578,10 @@ void OrganizerCore::downloadRequestedNXM(const QString &url)
 

 void OrganizerCore::externalMessage(const QString &message)

 {

-  if (message.left(6).toLower() == "nxm://") {

+  if (isMoShortcut(message)) {

+    runShortcut(moShortcutName(message));

+  }

+  else if (isNxmLink(message)) {

     MessageDialog::showMessage(tr("Download started"), qApp->activeWindow());

     downloadRequestedNXM(message);

   }

diff --git a/src/organizercore.h b/src/organizercore.h
index 901780a1..f8806289 100644
--- a/src/organizercore.h
+++ b/src/organizercore.h
@@ -85,6 +85,10 @@ private:
   typedef boost::signals2::signal<void (const QString&)> SignalModInstalled;

 

 public:

+  static bool isNxmLink(const QString &link) { return link.startsWith("nxm://", Qt::CaseInsensitive); }

+  static bool isMoShortcut(const QString &link) { return link.startsWith("moshortcut://", Qt::CaseInsensitive); }

+  static QString moShortcutName(const QString &link) { return link.mid(strlen("moshortcut://")); }

+

 

   OrganizerCore(const QSettings &initSettings);