ModdingRX/TmpMenu
1
0
Fork 0
mirror of https://github.com/Mr-X-GTA/YimMenu.git synced 2024-12-22 20:17:24 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

lua: fix enabling/disabling (#2745)

Browse Source
This commit is contained in:
Quentin 2024-02-21 13:05:01 +01:00 committed by GitHub
parent 80f28134a5
commit b1caff97fe
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lua/lua_manager.cpp
View File

@ -180,10 +180,12 @@ namespace big
const auto module_path = module->module_path(); const auto module_path = module->module_path();
// unload module // unload module
{
std::lock_guard guard(m_disabled_module_lock); std::lock_guard guard(m_disabled_module_lock);
std::erase_if(m_disabled_modules, [module_id](auto& module) { std::erase_if(m_disabled_modules, [module_id](auto& module) {
return module_id == module->module_id(); return module_id == module->module_id();
}); });
}
const auto new_module_path = move_file_relative_to_folder(m_disabled_scripts_folder.get_path(), m_scripts_folder.get_path(), module_path); const auto new_module_path = move_file_relative_to_folder(m_disabled_scripts_folder.get_path(), m_scripts_folder.get_path(), module_path);
if (new_module_path) if (new_module_path)
@ -202,10 +204,12 @@ namespace big
const auto module_path = module->module_path(); const auto module_path = module->module_path();
// unload module // unload module
{
std::lock_guard guard(m_disabled_module_lock); std::lock_guard guard(m_disabled_module_lock);
std::erase_if(m_modules, [module_id](auto& module) { std::erase_if(m_modules, [module_id](auto& module) {
return module_id == module->module_id(); return module_id == module->module_id();
}); });
}
const auto new_module_path = move_file_relative_to_folder(m_scripts_folder.get_path(), m_disabled_scripts_folder.get_path(), module_path); const auto new_module_path = move_file_relative_to_folder(m_scripts_folder.get_path(), m_disabled_scripts_folder.get_path(), module_path);
if (new_module_path) if (new_module_path)
@ -219,10 +223,14 @@ namespace big
void lua_manager::unload_module(rage::joaat_t module_id) void lua_manager::unload_module(rage::joaat_t module_id)
{ {
std::lock_guard guard(m_module_lock); std::lock_guard guard(m_module_lock);
std::erase_if(m_modules, [module_id](auto& module) { std::erase_if(m_modules, [module_id](auto& module) {
return module_id == module->module_id(); return module_id == module->module_id();
}); });
std::lock_guard guard2(m_disabled_module_lock);
std::erase_if(m_disabled_modules, [module_id](auto& module) {
return module_id == module->module_id();
});
} }
std::weak_ptr<lua_module> lua_manager::load_module(const std::filesystem::path& module_path) std::weak_ptr<lua_module> lua_manager::load_module(const std::filesystem::path& module_path)
@ -234,7 +242,7 @@ namespace big
} }
const auto module_name = module_path.filename().string(); const auto module_name = module_path.filename().string();
const auto id = rage::joaat(module_name); const auto id = rage::joaat(module_name);
std::lock_guard guard(m_module_lock); std::lock_guard guard(m_module_lock);
for (const auto& module : m_modules) for (const auto& module : m_modules)
@ -246,9 +254,9 @@ namespace big
} }
} }
const auto rel = relative(module_path, m_disabled_scripts_folder.get_path()); const auto rel = relative(module_path, m_disabled_scripts_folder.get_path());
const auto is_disabled_module = !rel.empty() && rel.native()[0] != '.'; const auto is_disabled_module = !rel.empty() && rel.native()[0] != '.';
const auto module = std::make_shared<lua_module>(module_path, m_scripts_folder, is_disabled_module); const auto module = std::make_shared<lua_module>(module_path, m_scripts_folder, is_disabled_module);
if (!module->is_disabled()) if (!module->is_disabled())
{ {
module->load_and_call_script(); module->load_and_call_script();