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

fix: 修复单例错误引发的资源加载错误

Browse Source
This commit is contained in:
MistEO
2023-05-02 16:55:27 +08:00
parent fee5a3bd5e
commit 3e4c15f1ff
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/MaaCore/Config/ResourceLoader.cpp
View File

@@ -46,14 +46,14 @@ void asst::ResourceLoader::load_thread_func()
}
}
void asst::ResourceLoader::add_load_queue(std::shared_ptr<AbstractResource> res_ptr, const std::filesystem::path& path)
void asst::ResourceLoader::add_load_queue(AbstractResource& res, const std::filesystem::path& path)
{
if (!res_ptr || !std::filesystem::exists(path)) {
if (!std::filesystem::exists(path)) {
return;
}
std::unique_lock<std::mutex> lock(m_load_mutex);
m_load_queue.emplace_back(std::move(res_ptr), path);
m_load_queue.emplace_back(&res, path);
m_load_cv.notify_all();
}
@@ -92,10 +92,9 @@ bool asst::ResourceLoader::load(const std::filesystem::path& path)
// DEBUG 模式下这里同步加载，并检查返回值的，方便排查问题
#define AsyncLoadConfig(Config, Filename) LoadResourceAndCheckRet(Config, Filename)
#else
#define AsyncLoadConfig(Config, Filename) \
{ \
auto res_ptr = std::make_shared<Config>(); \
add_load_queue(res_ptr, path / Filename); \
#define AsyncLoadConfig(Config, Filename) \
{ \
add_load_queue(SingletonHolder<Config>::get_instance(), path / Filename); \
}
#endif // ASST_DEBUG