From 497945bbbd18b4ff9cd264dc6a9d6cf8ba6bf08e Mon Sep 17 00:00:00 2001 From: Rémy Raes Date: Sat, 6 Jul 2024 12:40:36 +0200 Subject: Fix multiple audio file overrides (#677) This basically prevents audio files from being loaded into memory if matching audio event has already been overriden by a previous mod, preventing a crash from occurring. This means that audio mods now respect the load priority, i.e. mods with higher priority (= lower int value) will have priority over other mods on audio overrides. --- primedev/mods/modmanager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'primedev/mods') diff --git a/primedev/mods/modmanager.cpp b/primedev/mods/modmanager.cpp index edf69c9f..68f9bd0f 100644 --- a/primedev/mods/modmanager.cpp +++ b/primedev/mods/modmanager.cpp @@ -972,7 +972,7 @@ void ModManager::LoadMods() { if (fs::is_regular_file(file) && file.path().extension().string() == ".json") { - if (!g_CustomAudioManager.TryLoadAudioOverride(file.path())) + if (!g_CustomAudioManager.TryLoadAudioOverride(file.path(), mod.Name)) { spdlog::warn("Mod {} has an invalid audio def {}", mod.Name, file.path().filename().string()); continue; -- cgit v1.2.3