Merge pull request #156 from erasmux/vs_usvfs_plus_various_fixes

Vs usvfs plus various fixes

1 files changed, 16 insertions, 9 deletions

diff --git a/src/organizercore.cpp b/src/organizercore.cpp
index 98920479..7668485c 100644
--- a/src/organizercore.cpp
+++ b/src/organizercore.cpp
@@ -32,6 +32,7 @@
 #include <report.h>

 #include <questionboxmemory.h>

 #include "lockeddialog.h"

+#include "instancemanager.h"

 

 #include <QApplication>

 #include <QCoreApplication>

@@ -578,8 +579,8 @@ void OrganizerCore::downloadRequestedNXM(const QString &url)
 

 void OrganizerCore::externalMessage(const QString &message)

 {

-  if (isMoShortcut(message)) {

-    runShortcut(moShortcutName(message));

+  if (MOShortcut moshortcut{ message }) {

+    runShortcut(moshortcut);

   }

   else if (isNxmLink(message)) {

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

@@ -1181,7 +1182,7 @@ HANDLE OrganizerCore::spawnBinaryProcess(const QFileInfo &binary,
 

   // need to make sure all data is saved before we start the application

   if (m_CurrentProfile != nullptr) {

-    m_CurrentProfile->modlistWriter().writeImmediately(true);

+    m_CurrentProfile->writeModlistNow(true);

   }

 

   // TODO: should also pass arguments

@@ -1228,9 +1229,15 @@ HANDLE OrganizerCore::spawnBinaryProcess(const QFileInfo &binary,
   }

 }

 

-HANDLE OrganizerCore::runShortcut(const QString &title)

+HANDLE OrganizerCore::runShortcut(const MOShortcut& shortcut)

 {

-  Executable& exe = m_ExecutablesList.find(title);

+  if (shortcut.hasInstance() && shortcut.instance() != InstanceManager::instance().currentInstance())

+    throw std::runtime_error(

+      QString("Refusing to run executable from different instance %1:%2")

+      .arg(shortcut.instance(),shortcut.executable())

+      .toLocal8Bit().constData());

+

+  Executable& exe = m_ExecutablesList.find(shortcut.executable());

 

   return spawnBinaryDirect(

     exe.m_BinaryInfo, exe.m_Arguments,

@@ -1438,7 +1445,7 @@ void OrganizerCore::refreshModList(bool saveChanges)
 {

   // don't lose changes!

   if (saveChanges) {

-    m_CurrentProfile->modlistWriter().writeImmediately(true);

+    m_CurrentProfile->writeModlistNow(true);

   }

   ModInfo::updateFromDisc(m_Settings.getModDirectory(), &m_DirectoryStructure,

                           m_Settings.displayForeign(), managedGame());

@@ -1460,7 +1467,7 @@ void OrganizerCore::refreshESPList()
     });

     return;

   }

-  m_CurrentProfile->modlistWriter().write();

+  m_CurrentProfile->writeModlist();

 

   // clear list

   try {

@@ -1670,7 +1677,7 @@ std::vector<QString> OrganizerCore::enabledArchives()
 void OrganizerCore::refreshDirectoryStructure()

 {

   if (!m_DirectoryUpdate) {

-    m_CurrentProfile->modlistWriter().writeImmediately(true);

+    m_CurrentProfile->writeModlistNow(true);

 

     m_DirectoryUpdate = true;

     std::vector<std::tuple<QString, QString, int>> activeModList

@@ -1925,7 +1932,7 @@ void OrganizerCore::prepareStart()
   if (m_CurrentProfile == nullptr) {

     return;

   }

-  m_CurrentProfile->modlistWriter().write();

+  m_CurrentProfile->writeModlist();

   m_CurrentProfile->createTweakedIniFile();

   saveCurrentLists();

   m_Settings.setupLoadMechanism();