From be40ddf026d8f6439924bf898551c460530b128e Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Fri, 22 Dec 2017 14:08:17 -0800 Subject: [PATCH] [DatFile] Fix merged sets --- SabreTools.Library/DatFiles/DatFile.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SabreTools.Library/DatFiles/DatFile.cs b/SabreTools.Library/DatFiles/DatFile.cs index 28afef34..b28b2519 100644 --- a/SabreTools.Library/DatFiles/DatFile.cs +++ b/SabreTools.Library/DatFiles/DatFile.cs @@ -2879,7 +2879,7 @@ namespace SabreTools.Library.DatFiles else if (item.Type != ItemType.Disk && !this[parent].Contains(item)) { // Rename the child so it's in a subfolder - item.Name = item.Name + "\\" + item.Name; + item.Name = item.MachineName + "\\" + item.Name; // Update the machine to be the new parent item.CopyMachineInformation(copyFrom); @@ -2995,7 +2995,7 @@ namespace SabreTools.Library.DatFiles continue; } - // If the parent exists and has items, we copy the items from the parent to the current game + // If the parent exists and has items, we remove the parent items from the current game List parentItems = this[parent]; foreach (DatItem item in parentItems) { @@ -3006,7 +3006,7 @@ namespace SabreTools.Library.DatFiles } } - // Now we want to get the parent romof tag and put it in each of the items + // Now we want to get the parent romof tag and put it in each of the remaining items List items = this[game]; string romof = this[parent][0].RomOf; foreach (DatItem item in items)