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

fix: mumu display id error when ark not startup (#10786)

Browse Source
This commit is contained in:
MistEO
2024-10-12 01:42:22 +08:00
committed by GitHub
parent 11541e2c01
commit 9ff3b1e7a7
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/MaaCore/Controller/MumuExtras.cpp
View File

@@ -107,8 +107,9 @@ bool MumuExtras::load_mumu_library()
get_display_id_func_ = get_function<decltype(nemu_get_display_id)>(kGetDisplayIdFuncName);
if (!get_display_id_func_) {
LogError << "Failed to get function" << VAR(kGetDisplayIdFuncName);
return false;
LogWarn << "Failed to get function" << VAR(kGetDisplayIdFuncName);
// 兼容一下旧版本 mumu，没这个函数
// return false;
}
capture_display_func_ = get_function<decltype(nemu_capture_display)>(kCaptureDisplayFuncName);
@@ -174,8 +175,8 @@ bool MumuExtras::connect_mumu()
bool MumuExtras::init_screencap()
{
if (!capture_display_func_ || !get_display_id_func_) {
LogError << "capture_display_func_ or get_display_id_func_ is null";
if (!capture_display_func_) {
LogError << "capture_display_func_ is null";
return false;
}
@@ -210,9 +211,11 @@ int MumuExtras::get_display_id()
if (!display_id_cache_) {
if (!get_display_id_func_) {
LogError << "get_display_id_func_ is null";
display_id_cache_ = 0;
return 0;
}
display_id_cache_ = get_display_id_func_(mumu_handle_, package_name_.c_str(), 0);
int id = get_display_id_func_(mumu_handle_, package_name_.c_str(), 0);
display_id_cache_ = id < 0 ? 0 : id;
}
return *display_id_cache_;