modding: Additional sanity checks

Warzone2100 · Jul 6, 2024 · 699735a · 699735a
1 parent d65d1d2
commit 699735a
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/src/modding.cpp b/src/modding.cpp
@@ -45,6 +45,7 @@ static std::vector<Sha256> mod_hash_list;
 
 
 static void addLoadedMod(std::string modname, std::string filename, const std::string& fullRealPath);
+static bool hasLoadedModRealPath(const std::string& fullRealPath);
 
 
 static inline std::vector<std::string> split(std::string const &str, std::string const &sep)
@@ -122,6 +123,11 @@ size_t addSubdirs(const char *basedir, const char *subdir, const bool appendToPa
 #ifdef DEBUG
 			debug(LOG_NEVER, "Adding [%s] to search path", tmpFullModRealPath.c_str());
 #endif // DEBUG
+			if (hasLoadedModRealPath(tmpFullModRealPath))
+			{
+				debug(LOG_INFO, "Already loaded: %s, skipping", tmpFullModRealPath.c_str());
+				return true; // continue
+			}
 			if (PHYSFS_mount(tmpFullModRealPath.c_str(), NULL, appendToPath) != 0) // platform-dependent notation
 			{
 				numAddedMods++;
@@ -218,6 +224,13 @@ static void addLoadedMod(std::string modname, std::string filename, const std::s
 	mod_hash_list.clear();
 }
 
+static bool hasLoadedModRealPath(const std::string& fullRealPath)
+{
+	return std::any_of(loaded_mods.begin(), loaded_mods.end(), [fullRealPath](const WzMods::LoadedMod& loadedMod) -> bool {
+		return loadedMod.fullRealPath == fullRealPath;
+	});
+}
+
 void clearLoadedMods()
 {
 	loaded_mods.clear();