From 000bc4ca261832dc613571ff51655496c1ce0e5b Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Mon, 19 May 2025 11:05:15 -0400 Subject: [PATCH] Only check names for CHD --- SabreTools.DatFiles/DatFile.Splitting.cs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/SabreTools.DatFiles/DatFile.Splitting.cs b/SabreTools.DatFiles/DatFile.Splitting.cs index 29250a4c..124d2255 100644 --- a/SabreTools.DatFiles/DatFile.Splitting.cs +++ b/SabreTools.DatFiles/DatFile.Splitting.cs @@ -304,7 +304,10 @@ namespace SabreTools.DatFiles } // If there is no merge tag, add to parent - else if (mergeTag == null && !GetItemsForBucket(cloneOf).Contains(item)) + else if (mergeTag == null && !GetItemsForBucket(cloneOf) + .FindAll(i => i is Disk) + .ConvertAll(i => (i as Disk)!.GetName()) + .Contains(disk.GetName())) { disk.CopyMachineInformation(copyFrom); AddItem(disk, statsOnly: false); @@ -438,7 +441,10 @@ namespace SabreTools.DatFiles } // If there is no merge tag, add to parent - else if (mergeTag == null && !GetItemsForBucketDB(cloneOf).Values.Contains(item.Value)) + else if (mergeTag == null && !GetItemsForBucketDB(cloneOf).Values + .Where(i => i is Disk) + .Select(i => (i as Disk)!.GetName()) + .Contains(disk.GetName())) { ItemsDB.RemapDatItemToMachine(item.Key, cloneOfMachine.Key); ItemsDB.AddItem(item.Value, cloneOfMachine.Key, source.Key);