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 #872 from MaaAssistantArknights/dev

Browse Source 
Release v3.9.7
This commit is contained in:
MistEO
2022-06-14 00:40:31 +08:00
committed by GitHub
parent 8550244472 d5b127bc2c
commit b37e66d09c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/MeoAssistant/Controller.cpp
View File

@@ -282,7 +282,7 @@ std::optional<std::vector<unsigned char>> asst::Controller::call_command(const s
fd_set fdset = { 0 };
FD_SET(m_server_sock, &fdset);
constexpr int TimeoutMilliseconds = 10000;
timeval select_timeout = { TimeoutMilliseconds / 1000, 0 };
timeval select_timeout = { TimeoutMilliseconds / 1000, (TimeoutMilliseconds % 1000) * 1000};
select(static_cast<int>(m_server_sock) + 1, &fdset, NULL, NULL, &select_timeout);
if (FD_ISSET(m_server_sock, &fdset)) {
SOCKET client_sock = ::accept(m_server_sock, NULL, NULL);

2
src/MeoAsstGui/ViewModels/SettingsViewModel.cs
View File

@@ -241,7 +241,7 @@ namespace MeoAsstGui
{
var dialog = new Microsoft.Win32.OpenFileDialog();
dialog.Filter = "模拟器程序|*.exe";
dialog.Filter = "可执行文件|*.exe;*.bat;*.lnk";
if (dialog.ShowDialog() == true)
{