Skip to content

Commit 7f97ae5

Browse files
fix MergeKeyed edge case
1 parent d1e9b33 commit 7f97ae5

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

ModUtil.lua

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -959,8 +959,12 @@ end
959959
function ModUtil.Table.MergeKeyed( inTable, setTable )
960960
for setKey, setVal in pairs( setTable ) do
961961
local inVal = inTable[ setKey ]
962-
if type( setVal ) == "table" and type( inVal ) == "table" and not ModUtil.Table.UnKeyed( setVal ) then
963-
ModUtil.Table.MergeKeyed( inVal, setVal )
962+
if type( setVal ) == "table" and type( inVal ) == "table" then
963+
if ModUtil.Table.UnKeyed( setVal ) and ModUtil.Table.UnKeyed( inVal ) then
964+
ModUtil.Table.Replace( inVal, setVal )
965+
else
966+
ModUtil.Table.MergeKeyed( inVal, setVal )
967+
end
964968
else
965969
inTable[ setKey ] = setVal
966970
end

0 commit comments

Comments
 (0)