diff --git a/source/MaaToolkit/API/MaaToolkitDevice.cpp b/source/MaaToolkit/API/MaaToolkitDevice.cpp index 564f49a2b..e7f9a2ca1 100644 --- a/source/MaaToolkit/API/MaaToolkitDevice.cpp +++ b/source/MaaToolkit/API/MaaToolkitDevice.cpp @@ -61,7 +61,11 @@ MaaSize MaaToolkitWaitForFindDeviceToComplete() MaaSize MaaToolkitGetDeviceCount() { - return device_mgr.get_devices().value_or(std::vector {}).size(); + auto devices = device_mgr.get_devices(); + if (!devices) { + return 0; + } + return devices->size(); } MaaStringView MaaToolkitGetDeviceName(MaaSize index) diff --git a/source/MaaToolkit/AdbDevice/DeviceMgr.cpp b/source/MaaToolkit/AdbDevice/DeviceMgr.cpp index 581d5f325..7768bf09a 100644 --- a/source/MaaToolkit/AdbDevice/DeviceMgr.cpp +++ b/source/MaaToolkit/AdbDevice/DeviceMgr.cpp @@ -48,7 +48,6 @@ bool DeviceMgr::is_find_completed() const } if (!find_device_future_.valid()) { - LogError << "find_device_future_ is not running"; return false; } diff --git a/source/MaaUtils/IOStream/ChildPipeIOStream.cpp b/source/MaaUtils/IOStream/ChildPipeIOStream.cpp index 006798b33..49a4e1d0f 100644 --- a/source/MaaUtils/IOStream/ChildPipeIOStream.cpp +++ b/source/MaaUtils/IOStream/ChildPipeIOStream.cpp @@ -10,11 +10,11 @@ struct prevent_inherit : boost::process::extend::handler template void on_setup(boost::process::extend::windows_executor& exec) { - SIZE_T size; + SIZE_T size = 0; InitializeProcThreadAttributeList(NULL, 1, 0, &size); auto attrlist = reinterpret_cast(HeapAlloc(GetProcessHeap(), 0, size)); InitializeProcThreadAttributeList(attrlist, 1, 0, &size); - HANDLE empty[1]; + HANDLE empty[1] = {}; UpdateProcThreadAttribute(attrlist, 0, PROC_THREAD_ATTRIBUTE_HANDLE_LIST, empty, 0, NULL, NULL); exec.startup_info_ex.lpAttributeList = attrlist; }