diff --git a/src/MaaCore/Controller/AdbController.cpp b/src/MaaCore/Controller/AdbController.cpp index a262335c9b..554fee0d5e 100644 --- a/src/MaaCore/Controller/AdbController.cpp +++ b/src/MaaCore/Controller/AdbController.cpp @@ -307,8 +307,6 @@ bool asst::AdbController::start_game(const std::string& client_type) std::string cur_cmd = utils::string_replace_all(m_adb.start, "[PackageName]", package_name.value()); bool ret = call_command(cur_cmd).has_value(); - set_mumu_package(client_type); - return ret; } @@ -324,8 +322,6 @@ bool asst::AdbController::stop_game(const std::string& client_type) std::string cur_cmd = utils::string_replace_all(m_adb.stop, "[PackageName]", package_name.value()); bool ret = call_command(cur_cmd).has_value(); - set_mumu_package(""); - return ret; } diff --git a/src/MaaCore/Controller/MumuExtras.cpp b/src/MaaCore/Controller/MumuExtras.cpp index d05d823658..ae02323755 100644 --- a/src/MaaCore/Controller/MumuExtras.cpp +++ b/src/MaaCore/Controller/MumuExtras.cpp @@ -30,8 +30,6 @@ bool MumuExtras::init(const std::filesystem::path& mumu_path, int mumu_inst_inde void MumuExtras::set_package_name(const std::string& package_name) { - display_id_cache_ = std::nullopt; - if (package_name.empty()) { package_name_ = kDefaultPackage; } @@ -208,21 +206,18 @@ void MumuExtras::disconnect_mumu() int MumuExtras::get_display_id() { - if (!display_id_cache_) { - if (!get_display_id_func_) { - LogError << "get_display_id_func_ is null, please update your MuMu Player"; - display_id_cache_ = 0; - return 0; - } - } - - display_id_cache_ = get_display_id_func_(mumu_handle_, package_name_.c_str(), 0); - if (*display_id_cache_ < 0) { - LogWarn << "Failed to get display id" << VAR(*display_id_cache_) << VAR(package_name_); + if (!get_display_id_func_) { + LogError << "get_display_id_func_ is null, please update your MuMu Player"; return 0; } - return *display_id_cache_; + int id = get_display_id_func_(mumu_handle_, package_name_.c_str(), 0); + if (id < 0) { + LogWarn << "Failed to get display id" << VAR(id) << VAR(package_name_); + return 0; + } + + return id; } } // namespace asst diff --git a/src/MaaCore/Controller/MumuExtras.h b/src/MaaCore/Controller/MumuExtras.h index 339c8fb503..45fc3963d7 100644 --- a/src/MaaCore/Controller/MumuExtras.h +++ b/src/MaaCore/Controller/MumuExtras.h @@ -44,7 +44,6 @@ private: // mumu 的约定,default 给的是最前端 tab inline static std::string kDefaultPackage = "default"; std::string package_name_ = kDefaultPackage; - std::optional display_id_cache_; int mumu_handle_ = 0; int display_width_ = 0;