From 51d883780c4f024ab88f21bd5512fa09afce51d5 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Tue, 13 Mar 2018 15:55:10 -0700 Subject: [PATCH] [DatFile] Check for merge tags for non-disks too --- SabreTools.Library/DatFiles/DatFile.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SabreTools.Library/DatFiles/DatFile.cs b/SabreTools.Library/DatFiles/DatFile.cs index 202aeb99..43580ccc 100644 --- a/SabreTools.Library/DatFiles/DatFile.cs +++ b/SabreTools.Library/DatFiles/DatFile.cs @@ -2943,8 +2943,8 @@ namespace SabreTools.Library.DatFiles Add(parent, item); } - // Otherwise, if the parent doesn't already contain the non-disk, add it - else if (item.Type != ItemType.Disk && !this[parent].Contains(item)) + // Otherwise, if the parent doesn't already contain the non-disk (or a merge-equivalent), add it + else if (item.Type != ItemType.Disk && !this[parent].Contains(item) && !this[parent].Select(i => i.Name).Contains(((Disk)item).MergeTag)) { // Rename the child so it's in a subfolder item.Name = item.MachineName + "\\" + item.Name;