ModdingRX/YimMenu
Archived
1
0
Fork 0
Code Actions Releases Activity

Prevent repeat calls to cache rebuild causing a crash. (#3662)
Some checks are pending
Nightly Build / Build Nightly (push) Waiting to run
Details
Nightly Build / Recreate Release (push) Blocked by required conditions
Details
Nightly Build / Check Recent Commit (push) Successful in 30s
Details

Browse Source
This commit is contained in:
gir489 2024-09-05 14:03:10 -04:00 committed by GitHub
parent 21d8a81756
commit 41942f4d84
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/services/gta_data/gta_data_service.cpp
View File

@ -271,19 +271,26 @@ namespace big
void gta_data_service::rebuild_cache() void gta_data_service::rebuild_cache()
{ {
static bool completed = false;
if (completed == true)
{
return;
}
using hash_array = std::vector<uint32_t>; using hash_array = std::vector<uint32_t>;
hash_array mapped_peds; hash_array mapped_peds{};
hash_array mapped_vehicles; hash_array mapped_vehicles{};
hash_array mapped_weapons; hash_array mapped_weapons{};
hash_array mapped_components; hash_array mapped_components{};
int mp_weapons_thread_id = 0; int mp_weapons_thread_id = 0;
std::vector<ped_item> peds; std::vector<ped_item> peds{};
std::vector<vehicle_item> vehicles; std::vector<vehicle_item> vehicles{};
//std::vector<weapon_item> weapons; //std::vector<weapon_item> weapons;
std::unordered_map<Hash, weapon_item_parsed> weapons; std::unordered_map<Hash, weapon_item_parsed> weapons{};
std::vector<weapon_component> weapon_components; std::vector<weapon_component> weapon_components{};
constexpr auto exists = [](const hash_array& arr, uint32_t val) -> bool { constexpr auto exists = [](const hash_array& arr, uint32_t val) -> bool {
return std::find(arr.begin(), arr.end(), val) != arr.end(); return std::find(arr.begin(), arr.end(), val) != arr.end();
@ -675,6 +682,8 @@ namespace big
LOG(INFO) << "Finished writing cache to disk."; LOG(INFO) << "Finished writing cache to disk.";
load_data(); load_data();
completed = true; //Prevent repeat calls.
}); });
} }
} }

2
src/views/settings/view_gta_cache.cpp
View File

@ -13,7 +13,7 @@ namespace big
ImGui::Text(std::format("{}: {}\n{}: {}\n{}: {}\n{}: {}", "VIEW_GTA_CACHE_PEDS_CACHED"_T, ped_count, "VIEW_GTA_CACHE_VEHICLES_CACHED"_T, veh_count, "VIEW_GTA_CACHE_WEAPONS_CACHED"_T, wep_count, "VIEW_GTA_CACHE_WEAPON_COMPONENTS_CACHED"_T, wep_comp_count) ImGui::Text(std::format("{}: {}\n{}: {}\n{}: {}\n{}: {}", "VIEW_GTA_CACHE_PEDS_CACHED"_T, ped_count, "VIEW_GTA_CACHE_VEHICLES_CACHED"_T, veh_count, "VIEW_GTA_CACHE_WEAPONS_CACHED"_T, wep_count, "VIEW_GTA_CACHE_WEAPON_COMPONENTS_CACHED"_T, wep_comp_count)
.c_str()); .c_str());
if (components::button("VIEW_GTA_CACHE_REBUILD_CACHE"_T)) if (!*g_pointers->m_gta.m_is_session_started && components::button("VIEW_GTA_CACHE_REBUILD_CACHE"_T))
{ {
g_gta_data_service.set_state(eGtaDataUpdateState::NEEDS_UPDATE); g_gta_data_service.set_state(eGtaDataUpdateState::NEEDS_UPDATE);
g_gta_data_service.update_now(); g_gta_data_service.update_now();