From 14d9cd8da4f6adb02be9d272ea53a694080bd362 Mon Sep 17 00:00:00 2001 From: MistEO Date: Fri, 14 Jun 2024 10:41:15 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E5=8A=A0=E7=82=B9log=EF=BC=8C?= =?UTF-8?q?=E4=B8=80=E7=82=B9=E5=B0=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/MaaAdbControlUnit/Base/ProcessArgvGenerator.cpp | 7 +++---- source/MaaToolkit/AdbDevice/DeviceMgr.cpp | 2 ++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/source/MaaAdbControlUnit/Base/ProcessArgvGenerator.cpp b/source/MaaAdbControlUnit/Base/ProcessArgvGenerator.cpp index 6173396e..27944bce 100644 --- a/source/MaaAdbControlUnit/Base/ProcessArgvGenerator.cpp +++ b/source/MaaAdbControlUnit/Base/ProcessArgvGenerator.cpp @@ -35,13 +35,12 @@ std::optional string_replace_all_(s, replacement); } - auto stdpath = MAA_NS::path(res.front()); std::filesystem::path abs_path; - if (stdpath.is_absolute()) { - abs_path = stdpath; + if (auto raw_path = MAA_NS::path(res.front()); raw_path.is_absolute()) { + abs_path = raw_path; } else { - abs_path = boost::process::search_path(stdpath); + abs_path = boost::process::search_path(raw_path); } if (!std::filesystem::exists(abs_path)) { diff --git a/source/MaaToolkit/AdbDevice/DeviceMgr.cpp b/source/MaaToolkit/AdbDevice/DeviceMgr.cpp index 0bcf12ea..9a007ade 100644 --- a/source/MaaToolkit/AdbDevice/DeviceMgr.cpp +++ b/source/MaaToolkit/AdbDevice/DeviceMgr.cpp @@ -230,6 +230,8 @@ std::vector DeviceMgr::request_adb_serials( std::vector devices; auto found = control_unit->find_device(devices); + LogDebug << VAR(devices); + if (!found) { LogError << "Failed to find_device"; return {};