From: Jude Melton-Houghton <jwmhjwmh@gmail.com>
Date: Sun, 8 May 2022 13:14:14 +0000 (-0400)
Subject: Fix enabling of dependencies with identical names (#12253)
X-Git-Tag: 2022.05~5^2~17
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=54bc8a7627529b1736002a3c942858e0d59ceeba;p=dragonfireclient.git

Fix enabling of dependencies with identical names (#12253)
---

diff --git a/builtin/mainmenu/pkgmgr.lua b/builtin/mainmenu/pkgmgr.lua
index a95fef10b..ce5862ec2 100644
--- a/builtin/mainmenu/pkgmgr.lua
+++ b/builtin/mainmenu/pkgmgr.lua
@@ -466,11 +466,16 @@ function pkgmgr.enable_mod(this, toset)
 
 	-- Enable mods' depends after activation
 
-	-- Make a list of mod ids indexed by their names
+	-- Make a list of mod ids indexed by their names. Among mods with the
+	-- same name, enabled mods take precedence, after which game mods take
+	-- precedence, being last in the mod list.
 	local mod_ids = {}
 	for id, mod2 in pairs(list) do
 		if mod2.type == "mod" and not mod2.is_modpack then
-			mod_ids[mod2.name] = id
+			local prev_id = mod_ids[mod2.name]
+			if not prev_id or not list[prev_id].enabled then
+				mod_ids[mod2.name] = id
+			end
 		end
 	end