From c15ef1cc226487ef5d920401eefb742b00b06951 Mon Sep 17 00:00:00 2001 From: MistEO Date: Sun, 10 Sep 2023 12:43:32 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=AE=80=E5=8D=95=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=B8=80=E4=B8=8B=E5=BC=82=E6=AD=A5Load=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix #6250 --- src/MaaCore/Config/ResourceLoader.cpp | 2 ++ src/MaaCore/Config/ResourceLoader.h | 1 + 2 files changed, 3 insertions(+) diff --git a/src/MaaCore/Config/ResourceLoader.cpp b/src/MaaCore/Config/ResourceLoader.cpp index 327c8a558f..08783a2fb5 100644 --- a/src/MaaCore/Config/ResourceLoader.cpp +++ b/src/MaaCore/Config/ResourceLoader.cpp @@ -83,6 +83,8 @@ bool asst::ResourceLoader::load(const std::filesystem::path& path) return false; } + std::unique_lock lock(m_entry_mutex); + #define LoadResourceAndCheckRet(Config, Filename) \ { \ auto full_path = path / Filename; \ diff --git a/src/MaaCore/Config/ResourceLoader.h b/src/MaaCore/Config/ResourceLoader.h index b33aad80de..010737797b 100644 --- a/src/MaaCore/Config/ResourceLoader.h +++ b/src/MaaCore/Config/ResourceLoader.h @@ -56,6 +56,7 @@ namespace asst private: bool m_loaded = false; + std::mutex m_entry_mutex; // only for async load bool m_load_thread_exit = false;