mirrors/Sheas-Cealer
1
0
Fork 0
mirror of https://github.com/SpaceTimee/Sheas-Cealer.git synced 2025-07-13 21:02:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

1.1.3 -> 1.1.4 第86次更新

Browse Source
This commit is contained in:
Space Time 2024-12-20 15:58:05 +08:00
parent 13d8663a6e
commit ec5d3893fb
2 changed files with 108 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Utils/NginxCleaner.cs
View File

@ -9,11 +9,11 @@ namespace Sheas_Cealer.Utils;
internal static class NginxCleaner internal static class NginxCleaner
{ {
private static readonly SemaphoreSlim IsCleaningSemaphore = new(1); internal static readonly SemaphoreSlim IsNginxCleaningSemaphore = new(1);
internal static async Task Clean() internal static async Task Clean()
{ {
if (!await IsCleaningSemaphore.WaitAsync(0)) if (!await IsNginxCleaningSemaphore.WaitAsync(0))
return; return;
try try
@ -40,6 +40,6 @@ internal static class NginxCleaner
certStore.Close(); certStore.Close();
} }
finally { IsCleaningSemaphore.Release(); } finally { IsNginxCleaningSemaphore.Release(); }
} }
} }

10
Wins/MainWin.xaml.cs
View File

@ -19,6 +19,7 @@ using System.Security.Cryptography;
using System.Security.Cryptography.X509Certificates; using System.Security.Cryptography.X509Certificates;
using System.Text; using System.Text;
using System.Text.Json; using System.Text.Json;
using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
@ -55,6 +56,8 @@ public partial class MainWin : Window
private int GameClickTime = 0; private int GameClickTime = 0;
private int GameFlashInterval = 1000; private int GameFlashInterval = 1000;
private static readonly SemaphoreSlim IsNginxLaunchingSemaphore = new(1);
internal MainWin() internal MainWin()
{ {
InitializeComponent(); InitializeComponent();
@ -202,6 +205,11 @@ public partial class MainWin : Window
HoldButtonTimer?.Stop(); HoldButtonTimer?.Stop();
if (!MainPres.IsNginxRunning) if (!MainPres.IsNginxRunning)
{
if (NginxCleaner.IsNginxCleaningSemaphore.CurrentCount == 0 || !await IsNginxLaunchingSemaphore.WaitAsync(0))
return;
try
{ {
if ((CealHostRulesDict.ContainsValue(null!) && MessageBox.Show(MainConst._CealHostErrorPrompt, string.Empty, MessageBoxButton.YesNo) != MessageBoxResult.Yes) || if ((CealHostRulesDict.ContainsValue(null!) && MessageBox.Show(MainConst._CealHostErrorPrompt, string.Empty, MessageBoxButton.YesNo) != MessageBoxResult.Yes) ||
(NginxHttpsPort != 443 && MessageBox.Show(string.Format(MainConst._NginxHttpsPortOccupiedPrompt, NginxHttpsPort), string.Empty, MessageBoxButton.YesNo) != MessageBoxResult.Yes) || (NginxHttpsPort != 443 && MessageBox.Show(string.Format(MainConst._NginxHttpsPortOccupiedPrompt, NginxHttpsPort), string.Empty, MessageBoxButton.YesNo) != MessageBoxResult.Yes) ||
@ -312,6 +320,8 @@ public partial class MainWin : Window
MainPres.IsNginxIniting = false; MainPres.IsNginxIniting = false;
} }
} }
finally { IsNginxLaunchingSemaphore.Release(); }
}
else else
foreach (Process nginxProcess in Process.GetProcessesByName(Path.GetFileNameWithoutExtension(MainConst.NginxPath))) foreach (Process nginxProcess in Process.GetProcessesByName(Path.GetFileNameWithoutExtension(MainConst.NginxPath)))
{ {