3.1

MatsuriDayo · May 17, 2023 · 158dfed · 158dfed
1 parent e5eaa5c
commit 158dfed
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 13 deletions.
diff --git a/db/ConfigBuilder.cpp b/db/ConfigBuilder.cpp
@@ -732,7 +732,7 @@ namespace NekoRay {
             inboundObj["stack"] = Preset::SingBox::VpnImplementation.value(dataStore->vpn_implementation);
             inboundObj["strict_route"] = dataStore->vpn_strict_route;
             inboundObj["inet4_address"] = "172.19.0.1/28";
-            if (dataStore->vpn_ipv6) inboundObj["inet4_address"] = "fdfe:dcba:9876::1/126";
+            if (dataStore->vpn_ipv6) inboundObj["inet6_address"] = "fdfe:dcba:9876::1/126";
             if (dataStore->routing->sniffing_mode != SniffingMode::DISABLE) {
                 inboundObj["sniff"] = true;
                 inboundObj["sniff_override_destination"] = dataStore->routing->sniffing_mode == SniffingMode::FOR_DESTINATION;

diff --git a/nekoray_version.txt b/nekoray_version.txt
@@ -1 +1 @@
-3.0-2023-05-14
+3.1-2023-05-17
diff --git a/translations/fa_IR.ts b/translations/fa_IR.ts
@@ -678,10 +678,6 @@ These settings can be changed later.</source>
         <source>VPN Settings</source>
         <translation>تنظیمات vpn</translation>
     </message>
-    <message>
-        <source>VPN Implementation</source>
-        <translation>پیاده سازی VPN</translation>
-    </message>
     <message>
         <source>Hide Console</source>
         <translation>مخفی کردن کنسول</translation>

diff --git a/translations/zh_CN.ts b/translations/zh_CN.ts
@@ -676,10 +676,6 @@ These settings can be changed later.</source>
         <source>VPN Settings</source>
         <translation>VPN 设置</translation>
     </message>
-    <message>
-        <source>VPN Implementation</source>
-        <translation>VPN 实现</translation>
-    </message>
     <message>
         <source>Hide Console</source>
         <translation>隐藏控制台</translation>

diff --git a/ui/dialog_vpn_settings.ui b/ui/dialog_vpn_settings.ui
@@ -32,7 +32,7 @@
          </sizepolicy>
         </property>
         <property name="text">
-         <string>VPN Implementation</string>
+         <string notr="true">Stack</string>
         </property>
        </widget>
       </item>

diff --git a/ui/mainwindow.cpp b/ui/mainwindow.cpp
@@ -45,6 +45,7 @@
 #include <QMessageBox>
 #include <QDir>
 #include <QFileInfo>
+#include <QElapsedTimer>
 
 QElapsedTimer coreRestartTimer;
 
@@ -671,7 +672,10 @@ void MainWindow::on_menu_exit_triggered() {
         QDir::setCurrent(QApplication::applicationDirPath());
 
         auto arguments = NekoRay::dataStore->argv;
-        if (arguments.length() > 0) arguments.removeFirst();
+        if (arguments.length() > 0) {
+            arguments.removeFirst();
+            arguments.removeAll("-tray");
+        }
         auto isLauncher = qEnvironmentVariable("NKR_FROM_LAUNCHER") == "1";
         if (isLauncher) arguments.prepend("--");
         auto program = isLauncher ? "./launcher" : QApplication::applicationFilePath();

diff --git a/ui/mainwindow_grpc.cpp b/ui/mainwindow_grpc.cpp
@@ -256,7 +256,10 @@ void MainWindow::neko_start(int _id) {
         return true;
     };
 
-    if (!mu_starting.tryLock()) return;
+    if (!mu_starting.tryLock()) {
+        MessageBoxWarning(software_name, "Another profile is starting...");
+        return;
+    }
 
     // timeout message
     auto restartMsgbox = new QMessageBox(QMessageBox::Question, software_name, tr("If there is no response for a long time, it is recommended to restart the software."),