claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DatItem] Check parenting when merging

Browse Source
This commit is contained in:
Matt Nadareski
2018-03-13 17:43:16 -07:00
parent b9b7c30f57
commit 05465c0f45
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
SabreTools.Library/DatItems/DatItem.cs
View File

@@ -784,6 +784,13 @@ namespace SabreTools.Library.DatItems
saveditem.Name = file.Name; 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; break;
} }
} }