From 8fa966aba4dbac6d8dc2e7d8a8185286edb74011 Mon Sep 17 00:00:00 2001
From: arm64v8a <48624112+arm64v8a@users.noreply.github.com>
Date: Sun, 22 Jan 2023 17:20:32 +0900
Subject: [PATCH] bug fix

---
 ui/edit/edit_custom.cpp |   6 +-
 ui/edit/edit_custom.ui  | 178 +++++++++++++++++++++++-----------------
 ui/mainwindow.cpp       |   4 +-
 3 files changed, 108 insertions(+), 80 deletions(-)

diff --git a/ui/edit/edit_custom.cpp b/ui/edit/edit_custom.cpp
index 1fed9c8..fbd1b19 100644
--- a/ui/edit/edit_custom.cpp
+++ b/ui/edit/edit_custom.cpp
@@ -81,10 +81,8 @@ void EditCustom::onStart(QSharedPointer<NekoRay::ProxyEntity> _ent) {
     if (preset_core == "internal") {
         ui->core->hide();
         ui->core_l->setText(tr("Outbound JSON, please read the documentation."));
-        ui->command->hide();
-        ui->command_l->hide();
-        ui->config_suffix->hide();
-        ui->config_suffix_l->hide();
+        ui->w_ext1->hide();
+        ui->w_ext2->hide();
     }
 
     // Preview
diff --git a/ui/edit/edit_custom.ui b/ui/edit/edit_custom.ui
index 4ed650c..a34d6c4 100644
--- a/ui/edit/edit_custom.ui
+++ b/ui/edit/edit_custom.ui
@@ -46,88 +46,116 @@
     </layout>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <item>
-      <widget class="QLabel" name="command_l">
-       <property name="text">
-        <string>Command</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="command">
-       <property name="placeholderText">
-        <string notr="true">%config%</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="config_suffix_l">
-       <property name="text">
-        <string>Config Suffix</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QComboBox" name="config_suffix">
-       <property name="editable">
-        <bool>true</bool>
-       </property>
-       <item>
+    <widget class="QWidget" name="w_ext1" native="true">
+     <layout class="QHBoxLayout" name="horizontalLayout_2">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QLabel" name="command_l">
         <property name="text">
-         <string notr="true"/>
+         <string>Command</string>
         </property>
-       </item>
-       <item>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLineEdit" name="command">
+        <property name="placeholderText">
+         <string notr="true">%config%</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="config_suffix_l">
         <property name="text">
-         <string notr="true">json</string>
+         <string>Config Suffix</string>
         </property>
-       </item>
-       <item>
-        <property name="text">
-         <string notr="true">yml</string>
+       </widget>
+      </item>
+      <item>
+       <widget class="QComboBox" name="config_suffix">
+        <property name="editable">
+         <bool>true</bool>
         </property>
-       </item>
-      </widget>
-     </item>
-    </layout>
+        <item>
+         <property name="text">
+          <string notr="true"/>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string notr="true">json</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string notr="true">yml</string>
+         </property>
+        </item>
+       </widget>
+      </item>
+     </layout>
+    </widget>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_3">
-     <item>
-      <widget class="QLabel" name="label">
-       <property name="toolTip">
-        <string>Random if it's empty or zero.</string>
-       </property>
-       <property name="text">
-        <string notr="true">Mapping Port</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="mapping_port"/>
-     </item>
-     <item>
-      <widget class="QLabel" name="label_2">
-       <property name="toolTip">
-        <string>Random if it's empty or zero.</string>
-       </property>
-       <property name="text">
-        <string notr="true">Socks Port</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="socks_port"/>
-     </item>
-     <item>
-      <widget class="QPushButton" name="preview">
-       <property name="text">
-        <string>Preview</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
+    <widget class="QWidget" name="w_ext2" native="true">
+     <layout class="QHBoxLayout" name="horizontalLayout_3">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QLabel" name="label">
+        <property name="toolTip">
+         <string>Random if it's empty or zero.</string>
+        </property>
+        <property name="text">
+         <string notr="true">Mapping Port</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLineEdit" name="mapping_port"/>
+      </item>
+      <item>
+       <widget class="QLabel" name="label_2">
+        <property name="toolTip">
+         <string>Random if it's empty or zero.</string>
+        </property>
+        <property name="text">
+         <string notr="true">Socks Port</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLineEdit" name="socks_port"/>
+      </item>
+      <item>
+       <widget class="QPushButton" name="preview">
+        <property name="text">
+         <string>Preview</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
    </item>
    <item>
     <widget class="QTextEdit" name="config_simple">
diff --git a/ui/mainwindow.cpp b/ui/mainwindow.cpp
index 0897d36..2e79b0a 100644
--- a/ui/mainwindow.cpp
+++ b/ui/mainwindow.cpp
@@ -1340,7 +1340,9 @@ void MainWindow::show_log_impl(const QString &log) {
     }
 }
 
-#define ADD_TO_CURRENT_ROUTE(a, b) NekoRay::dataStore->routing->a = (SplitLines(NekoRay::dataStore->routing->a) << (b)).join("\n");
+#define ADD_TO_CURRENT_ROUTE(a, b)                                                                   \
+    NekoRay::dataStore->routing->a = (SplitLines(NekoRay::dataStore->routing->a) << (b)).join("\n"); \
+    NekoRay::dataStore->routing->Save();
 
 void MainWindow::on_masterLogBrowser_customContextMenuRequested(const QPoint &pos) {
     QMenu *menu = ui->masterLogBrowser->createStandardContextMenu();