From ff2b5f52b86b3e6a03e92bd44b855567c70bb77d Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Sat, 4 Feb 2017 13:16:20 -0800 Subject: [PATCH] [DatFile] Add second special case for disks in merge --- SabreTools.Helper/Dats/Partials/DatFile.Bucketing.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/SabreTools.Helper/Dats/Partials/DatFile.Bucketing.cs b/SabreTools.Helper/Dats/Partials/DatFile.Bucketing.cs index 4818fbb8..013a3072 100644 --- a/SabreTools.Helper/Dats/Partials/DatFile.Bucketing.cs +++ b/SabreTools.Helper/Dats/Partials/DatFile.Bucketing.cs @@ -809,7 +809,15 @@ namespace SabreTools.Helper.Dats List items = this[game]; foreach (DatItem item in items) { - if (!this[parent].Contains(item)) + // If we have a disk, we have to see ONLY if the name is in the list + if (item.Type == ItemType.Disk && !this[parent].Select(i => i.Name).Contains(item.Name)) + { + item.Machine = parentMachine; + this[parent].Add(item); + } + + // Otherwise, we want to add it normally + else if (!this[parent].Contains(item)) { // TODO: Remove hack for just disks at a later date item.Name = (item.Type != ItemType.Disk ? item.Machine.Name + "\\" : "") + item.Name;