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

fix: 继续修复停止按钮有时失效的问题

Browse Source
This commit is contained in:
zzyyyl
2022-10-27 20:02:43 +08:00
parent eed774db92
commit 6d5796e839
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs
View File

@@ -635,8 +635,9 @@ namespace MeoAsstGui
bool caught = await task;
// 一般是点了“停止”按钮了
if (Idle)
if (Stopping)
{
SetStopped();
return;
}
@@ -664,8 +665,9 @@ namespace MeoAsstGui
}
// 一般是点了“停止”按钮了
if (Idle)
if (Stopping)
{
SetStopped();
return;
}
@@ -729,8 +731,9 @@ namespace MeoAsstGui
}
// 一般是点了“停止”按钮了
if (Idle)
if (Stopping)
{
SetStopped();
return;
}
@@ -751,7 +754,6 @@ namespace MeoAsstGui
/// </summary>
public async void Stop()
{
Idle = true;
Stopping = true;
AddLog(Localization.GetString("Stopping"));
var task = Task.Run(() =>
@@ -759,14 +761,15 @@ namespace MeoAsstGui
return _container.Get<AsstProxy>().AsstStop();
});
await task;
SetStopped();
}
public void SetStopped()
{
if (!Idle || Stopping) {
if (!Idle || Stopping)
{
AddLog(Localization.GetString("Stopped"));
}
Stopping = false;
Idle = true;
}