Defer second nxmhandler call (#2390)

- Calls run in parallel leading to extraneous setup dialogs
- This only calls the nxm schema registration after modl is done

3 files changed, 27 insertions, 18 deletions

diff --git a/src/settings.cpp b/src/settings.cpp
index 4f484590..82e99de0 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -419,31 +419,40 @@ void Settings::setKeepBackupOnInstall(bool b)
 
 void Settings::registerDownloadHandlers(bool force)
 {
-  m_Nexus.registerAsNXMHandler(force);
-  registerAsMODLHandler(force);
+  registerAsMODLHandler(force, true);
 }
 
-void Settings::registerAsMODLHandler(bool force)
+void Settings::registerAsMODLHandler(bool force, bool includeNxm)
 {
   const auto nxmPath = QCoreApplication::applicationDirPath() + "/" +
                        QString::fromStdWString(AppConfig::nxmHandlerExe());
 
   const auto executable = QCoreApplication::applicationFilePath();
 
-  QString mode       = force ? "forcereg" : "reg";
-  QString parameters = mode + " modl " + m_Game.plugin()->gameShortName();
-  for (const QString& altGame : m_Game.plugin()->validShortNames()) {
-    parameters += "," + altGame;
-  }
-  parameters +=
-      " \"" + executable + "\" \"-n %name% -m %modname% -v %version% -s %source%\"";
+  QStringList parameters = {force ? "forcereg" : "reg", "modl"};
+  QStringList games      = {m_Game.plugin()->gameShortName()};
+  games.append(m_Game.plugin()->validShortNames());
+  parameters.append(games.join(","));
+  parameters.append({executable, "-n %name% -m %modname% -v %version% -s %source%"});
 
-  const auto r = shell::Execute(nxmPath, parameters);
-  if (!r.success()) {
-    QMessageBox::critical(
-        nullptr, QObject::tr("Failed"),
-        QObject::tr("Failed to start the helper application: %1").arg(r.toString()));
-  }
+  QProcess* modlNxmProcess = new QProcess(this);
+
+  connect(modlNxmProcess, &QProcess::finished,
+          [=](int exitCode, QProcess::ExitStatus exitStatus) {
+            if (exitStatus == QProcess::NormalExit) {
+              if (includeNxm) {
+                nexus().registerAsNXMHandler(force);
+              }
+            } else {
+              QMessageBox::critical(
+                  nullptr, QObject::tr("Failed"),
+                  QObject::tr("Failed to start the helper application: %1")
+                      .arg(modlNxmProcess->program()));
+            }
+            modlNxmProcess->deleteLater();
+          });
+
+  modlNxmProcess->start(nxmPath, parameters);
 }
 
 GameSettings& Settings::game()
diff --git a/src/settings.h b/src/settings.h
index b4185e86..626582d1 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -821,7 +821,7 @@ public:
   // if 'force' is true, the registration dialog will be shown even if the user
   // said earlier not to
   //
-  void registerAsMODLHandler(bool force);
+  void registerAsMODLHandler(bool force, bool includeNxm = false);
 
   // whether archives should be parsed to show conflicts and contents
   //
diff --git a/src/shared/appconfig.inc b/src/shared/appconfig.inc
index 9058bf18..b3946774 100644
--- a/src/shared/appconfig.inc
+++ b/src/shared/appconfig.inc
@@ -19,7 +19,7 @@ APPPARAM(std::wstring, proxyDLLSource, L"proxy.dll")
 APPPARAM(std::wstring, vfs32DLLName, L"usvfs_x86.dll")

 APPPARAM(std::wstring, vfs64DLLName, L"usvfs_x64.dll")

 APPPARAM(std::wstring, nxmHandlerExe, L"nxmhandler.exe")

-APPPARAM(std::wstring, nxmHandlerIni, L"nxmhandler.ini")

+APPPARAM(std::wstring, nxmHandlerIni, L"downloadhandler.ini")

 APPPARAM(std::wstring, portableLockFileName, L"portable.txt")

 APPPARAM(const wchar_t*, localSavePlaceholder, L"__MOProfileSave__\\")