Merge pull request #625 from robertthepie/FixArchiveAlreadyLoaded

Fix Archive Already Loaded
beyond-all-reason · Apr 3, 2024 · e89f377 · e89f377
2 parents 1b8e8b1 + ec5e2fe
commit e89f377
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/LuaMenu/widgets/gui_modoptions_panel.lua b/LuaMenu/widgets/gui_modoptions_panel.lua
@@ -660,7 +660,20 @@ function ModoptionsPanel.LoadModoptions(gameName, newBattleLobby)
 		return VFS.Include("modoptions.lua", nil, VFS.ZIP)
 	end
 
-	modoptions = VFS.UseArchive(gameName, LoadModOptions)
+	do
+		local alreadyLoaded = false
+		for _, archive in pairs(VFS.GetLoadedArchives()) do
+			if archive == gameName then
+				alreadyLoaded = true
+				break
+			end
+		end
+		if alreadyLoaded then
+			modoptions = VFS.Include("modoptions.lua", nil, VFS.ZIP)
+		else
+			modoptions = VFS.UseArchive(gameName, LoadModOptions)
+		end
+	end
 
 	modoptionDefaults = {}
 	if not modoptions then