fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 18:20:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

revert: 暂时删除WPF单例锁

Browse Source
This commit is contained in:
MistEO
2023-05-15 22:00:38 +08:00
parent 4adba3f3d8
commit abb8f0b7ee
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/MaaWpfGui/Main/Bootstrapper.cs
View File

@@ -39,27 +39,27 @@ namespace MaaWpfGui.Main
public class Bootstrapper : Bootstrapper<RootViewModel>
{
private static ILogger _logger = Logger.None;
private static Mutex _mutex;
//private static Mutex _mutex;
/// <inheritdoc/>
/// <remarks>初始化些啥自己加。</remarks>
protected override void OnStart()
{
// 设置互斥量的名称
string mutexName = "MAA_" + Directory.GetCurrentDirectory().Replace("\\", "_").Replace(":", string.Empty);
_mutex = new Mutex(true, mutexName);
//string mutexName = "MAA_" + Directory.GetCurrentDirectory().Replace("\\", "_").Replace(":", string.Empty);
//_mutex = new Mutex(true, mutexName);
if (!_mutex.WaitOne(TimeSpan.Zero, true))
{
// 这里还没加载语言包，就不 GetString 了
MessageBox.Show("同一路径下只能启动一个实例！\n\n" +
"同一路徑下只能啟動一個實例！\n\n" +
"Only one instance can be launched under the same path!\n\n" +
"同じパスの下で1つのインスタンスしか起動できません！\n\n" +
"동일한 경로에는 하나의 인스턴스만 실행할 수 있습니다!");
Application.Current.Shutdown();
return;
}
//if (!_mutex.WaitOne(TimeSpan.Zero, true))
//{
// // 这里还没加载语言包，就不 GetString 了
// MessageBox.Show("同一路径下只能启动一个实例！\n\n" +
// "同一路徑下只能啟動一個實例！\n\n" +
// "Only one instance can be launched under the same path!\n\n" +
// "同じパスの下で1つのインスタンスしか起動できません！\n\n" +
// "동일한 경로에는 하나의 인스턴스만 실행할 수 있습니다!");
// Application.Current.Shutdown();
// return;
//}
Directory.SetCurrentDirectory(AppDomain.CurrentDomain.BaseDirectory);
if (Directory.Exists("debug") is false)
@@ -176,9 +176,9 @@ namespace MaaWpfGui.Main
/// <remarks>退出时执行啥自己加。</remarks>
protected override void OnExit(ExitEventArgs e)
{
// 释放互斥量
_mutex?.ReleaseMutex();
_mutex?.Dispose();
//// 释放互斥量
//_mutex?.ReleaseMutex();
//_mutex?.Dispose();
// MessageBox.Show("O(∩_∩)O 拜拜");
Instances.SettingsViewModel.Sober();
@@ -201,12 +201,12 @@ namespace MaaWpfGui.Main
public static void RestartApplication()
{
// 释放互斥量
_mutex?.ReleaseMutex();
_mutex?.Dispose();
//// 释放互斥量
//_mutex?.ReleaseMutex();
//_mutex?.Dispose();
// 避免 OnExit 时再次释放
_mutex = null;
//// 避免 OnExit 时再次释放
//_mutex = null;
System.Windows.Forms.Application.Restart();
}