claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DatFile] Make merging logic consistent with CMP

Browse Source
This commit is contained in:
Matt Nadareski
2017-03-30 16:03:58 -07:00
parent 855e5eefb5
commit c96578bf33
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
SabreTools.Helper/Dats/Partials/DatFile.Manipulate.cs
View File

@@ -801,9 +801,16 @@ namespace SabreTools.Helper.Dats
// Otherwise, if the parent doesn't already contain the non-disk, add it
else if (item.Type != ItemType.Disk && !this[parent].Contains(item))
{
item.Name = item.Machine.Name + "\\" + item.Name;
// If we already have the same name in the parent set, rename the child
if (this[parent].Select(i => i.Name).Contains(item.Name))
{
item.Name = item.Machine.Name + "\\" + item.Name; // TODO: Go back to this for all roms in the future
}
// Update the machine to be the new parent
item.Machine = parentMachine;
// Add the rom to the parent set
this[parent].Add(item);
}
}