From 05465c0f45ca945598b657263ec47b66d9b03adc Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Tue, 13 Mar 2018 17:43:16 -0700
Subject: [PATCH] [DatItem] Check parenting when merging

---
 SabreTools.Library/DatItems/DatItem.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/SabreTools.Library/DatItems/DatItem.cs b/SabreTools.Library/DatItems/DatItem.cs
index ffdf0346..6197f0a9 100644
--- a/SabreTools.Library/DatItems/DatItem.cs
+++ b/SabreTools.Library/DatItems/DatItem.cs
@@ -784,6 +784,13 @@ namespace SabreTools.Library.DatItems
 							saveditem.Name = file.Name;
 						}
 
+						// If the current machine is a child of the new machine, use the new machine instead
+						if (saveditem.CloneOf == file.MachineName || saveditem.RomOf == file.MachineName)
+						{
+							saveditem.CopyMachineInformation(file);
+							saveditem.Name = file.Name;
+						}
+
 						break;
 					}
 				}