fix restart

MatsuriDayo · Apr 2, 2023 · 46bad85 · 46bad85
1 parent a88712a
commit 46bad85
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/main/NekoRay_DataStore.hpp b/main/NekoRay_DataStore.hpp
@@ -65,6 +65,7 @@ namespace NekoRay {
         int resolve_count = 0;
 
         // Flags
+        QStringList argv = {};
         bool flag_use_appdata = false;
         bool flag_many = false;
         bool flag_tray = false;

diff --git a/main/main.cpp b/main/main.cpp
@@ -52,11 +52,11 @@ int main(int argc, char *argv[]) {
 #endif
 
     // Flags
-    auto args = QApplication::arguments();
-    if (args.contains("-many")) NekoRay::dataStore->flag_many = true;
-    if (args.contains("-appdata")) NekoRay::dataStore->flag_use_appdata = true;
-    if (args.contains("-tray")) NekoRay::dataStore->flag_tray = true;
-    if (args.contains("-debug")) NekoRay::dataStore->flag_debug = true;
+    NekoRay::dataStore->argv = QApplication::arguments();
+    if (NekoRay::dataStore->argv.contains("-many")) NekoRay::dataStore->flag_many = true;
+    if (NekoRay::dataStore->argv.contains("-appdata")) NekoRay::dataStore->flag_use_appdata = true;
+    if (NekoRay::dataStore->argv.contains("-tray")) NekoRay::dataStore->flag_tray = true;
+    if (NekoRay::dataStore->argv.contains("-debug")) NekoRay::dataStore->flag_debug = true;
 #ifdef NKR_CPP_USE_APPDATA
     NekoRay::dataStore->flag_use_appdata = true; // Example: Package & MacOS
 #endif

diff --git a/sys/ExternalProcess.cpp b/sys/ExternalProcess.cpp
@@ -1,4 +1,5 @@
 #include "ExternalProcess.hpp"
+#include "main/NekoRay.hpp"
 
 #include <QTimer>
 #include <QDir>

diff --git a/sys/ExternalProcess.hpp b/sys/ExternalProcess.hpp
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "main/NekoRay.hpp"
-
 #include <QProcess>
 
 namespace NekoRay::sys {

diff --git a/ui/mainwindow.cpp b/ui/mainwindow.cpp
@@ -627,7 +627,9 @@ void MainWindow::on_menu_exit_triggered() {
         QProcess::startDetached("./updater", QStringList{});
     } else if (exit_reason == 2) {
         QDir::setCurrent(QApplication::applicationDirPath());
-        QProcess::startDetached(qEnvironmentVariable("NKR_FROM_LAUNCHER") == "1" ? "./launcher" : QApplication::applicationFilePath(), QStringList{});
+        auto arguments = NekoRay::dataStore->argv;
+        if (arguments.length() > 0) arguments.removeFirst();
+        QProcess::startDetached(qEnvironmentVariable("NKR_FROM_LAUNCHER") == "1" ? "./launcher" : QApplication::applicationFilePath(), arguments);
     }
     tray->hide();
     QCoreApplication::quit();