diff --git a/Consts/MainMultilangConst.Designer.cs b/Consts/MainMultilangConst.Designer.cs
index 804637b..6a16880 100644
--- a/Consts/MainMultilangConst.Designer.cs
+++ b/Consts/MainMultilangConst.Designer.cs
@@ -429,6 +429,15 @@ namespace Sheas_Cealer.Consts {
}
}
+ ///
+ /// 查找类似 GLB. Purging STP. 的本地化字符串。
+ ///
+ public static string MihomoButtonIsStoppingContent {
+ get {
+ return ResourceManager.GetString("MihomoButtonIsStoppingContent", resourceCulture);
+ }
+ }
+
///
/// 查找类似 GLB. Cealing INIT. 的本地化字符串。
///
diff --git a/Consts/MainMultilangConst.resx b/Consts/MainMultilangConst.resx
index c53eea8..6dd2bb0 100644
--- a/Consts/MainMultilangConst.resx
+++ b/Consts/MainMultilangConst.resx
@@ -180,6 +180,9 @@
Click to launch a local Mihomo
+
+ GLB. Purging STP.
+
GLB. Cealing INIT.
diff --git a/Consts/MainMultilangConst.zh.resx b/Consts/MainMultilangConst.zh.resx
index d616d26..39d4a56 100644
--- a/Consts/MainMultilangConst.zh.resx
+++ b/Consts/MainMultilangConst.zh.resx
@@ -180,6 +180,9 @@
点击启动本地 Mihomo
+
+ 全局净化停止中
+
全局伪造启动中
diff --git a/Convs/MainMihomoButtonContentConv.cs b/Convs/MainMihomoButtonContentConv.cs
index a09aea8..eb95a20 100644
--- a/Convs/MainMihomoButtonContentConv.cs
+++ b/Convs/MainMihomoButtonContentConv.cs
@@ -10,11 +10,13 @@ internal class MainMihomoButtonContentConv : IMultiValueConverter
public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
{
bool isMihomoRunning = (bool)values[0];
- bool isMihomoIniting = (bool)values[1];
- bool isCoproxyIniting = (bool)values[2];
- bool isCoproxyStopping = (bool)values[3];
+ bool isComihomoIniting = (bool)values[1];
+ bool isMihomoIniting = (bool)values[2];
+ bool isCoproxyIniting = (bool)values[3];
+ bool isCoproxyStopping = (bool)values[4];
return isCoproxyIniting || isCoproxyStopping ? Binding.DoNothing :
+ isComihomoIniting ? MainConst.MihomoButtonIsStoppingContent :
isMihomoIniting ? MainConst.MihomoButtonIsInitingContent :
isMihomoRunning ? MainConst.MihomoButtonIsRunningContent : MainConst.MihomoButtonIsStoppedContent;
}
diff --git a/Wins/MainWin.xaml b/Wins/MainWin.xaml
index c111372..008c3e9 100644
--- a/Wins/MainWin.xaml
+++ b/Wins/MainWin.xaml
@@ -120,6 +120,7 @@
+
diff --git a/Wins/MainWin.xaml.cs b/Wins/MainWin.xaml.cs
index 5142915..373ff43 100644
--- a/Wins/MainWin.xaml.cs
+++ b/Wins/MainWin.xaml.cs
@@ -349,10 +349,11 @@ public partial class MainWin : Window
}
else
{
- MainPres.IsCoproxyStopping = true;
-
bool isConginxRunning = MainPres.IsConginxRunning;
+ if (isConginxRunning)
+ MainPres.IsCoproxyStopping = true;
+
foreach (Process nginxProcess in Process.GetProcessesByName(Path.GetFileNameWithoutExtension(isConginxRunning ? MainConst.ConginxPath : MainConst.NginxPath)))
{
nginxProcess.Exited += async (_, _) =>