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

Merge pull request #592 from sakuraxp/dev

Browse Source 
fix.修正了在某些情况下，修改模拟器连接设置不生效的bug。
This commit is contained in:
MistEO
2022-05-28 12:51:40 +08:00
committed by GitHub
parent 8079bc752f abae6f4753
commit 2f70f3d8cf
2 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/MeoAsstGui/ViewModels/CopilotViewModel.cs
View File

@@ -99,14 +99,11 @@ namespace MeoAsstGui
var asstProxy = _container.Get<AsstProxy>();
string errMsg = "";
if (!_catched)
var task = Task.Run(() =>
{
var task = Task.Run(() =>
{
return asstProxy.AsstConnect(ref errMsg);
});
_catched = await task;
}
return asstProxy.AsstConnect(ref errMsg);
});
_catched = await task;
if (!_catched)
{
AddLog(errMsg, "darkred");

13
src/MeoAsstGui/ViewModels/RecruitViewModel.cs
View File

@@ -116,15 +116,12 @@ namespace MeoAsstGui
{
var asstProxy = _container.Get<AsstProxy>();
string errMsg = "";
if (!_catched)
RecruitInfo = "正在连接模拟器……";
var task = Task.Run(() =>
{
RecruitInfo = "正在连接模拟器……";
var task = Task.Run(() =>
{
return asstProxy.AsstConnect(ref errMsg);
});
_catched = await task;
}
return asstProxy.AsstConnect(ref errMsg);
});
_catched = await task;
if (!_catched)
{
RecruitInfo = errMsg;