1.1.3 -> 1.1.4 第84次更新

This commit is contained in:
Space Time 2024-12-20 11:09:32 +08:00
parent dcef7be238
commit af28d96bf9

View File

@ -313,20 +313,21 @@ public partial class MainWin : Window
} }
} }
else else
{
foreach (Process nginxProcess in Process.GetProcessesByName(Path.GetFileNameWithoutExtension(MainConst.NginxPath))) foreach (Process nginxProcess in Process.GetProcessesByName(Path.GetFileNameWithoutExtension(MainConst.NginxPath)))
{ {
nginxProcess.Exited += async (_, _) =>
{
await NginxCleaner.Clean();
NginxHttpPort = 80;
NginxHttpsPort = 443;
NginxConfWatcher_Changed(null!, null!);
};
nginxProcess.Kill(); nginxProcess.Kill();
nginxProcess.WaitForExit();
} }
await NginxCleaner.Clean();
NginxHttpPort = 80;
NginxHttpsPort = 443;
NginxConfWatcher_Changed(null!, null!);
}
} }
private void MihomoButton_Click(object sender, RoutedEventArgs e) private void MihomoButton_Click(object sender, RoutedEventArgs e)
{ {
if (HoldButtonTimer == null || HoldButtonTimer.IsEnabled) if (HoldButtonTimer == null || HoldButtonTimer.IsEnabled)
@ -393,16 +394,16 @@ public partial class MainWin : Window
} }
} }
else else
{
foreach (Process mihomoProcess in Process.GetProcessesByName(Path.GetFileNameWithoutExtension(MainConst.MihomoPath))) foreach (Process mihomoProcess in Process.GetProcessesByName(Path.GetFileNameWithoutExtension(MainConst.MihomoPath)))
{ {
mihomoProcess.Kill(); mihomoProcess.Exited += (_, _) =>
mihomoProcess.WaitForExit(); {
} MihomoMixedPort = 7880;
MihomoConfWatcher_Changed(null!, null!);
};
MihomoMixedPort = 7880; mihomoProcess.Kill();
MihomoConfWatcher_Changed(null!, null!); }
}
} }
private async void EditHostButton_Click(object sender, RoutedEventArgs e) private async void EditHostButton_Click(object sender, RoutedEventArgs e)