From 94197bbb301606094ddb838abc02da55179ee242 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Tue, 13 Mar 2018 15:52:53 -0700 Subject: [PATCH] [DatItem] Get correct size on merge --- SabreTools.Library/DatItems/DatItem.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/SabreTools.Library/DatItems/DatItem.cs b/SabreTools.Library/DatItems/DatItem.cs index 545e605d..ffdf0346 100644 --- a/SabreTools.Library/DatItems/DatItem.cs +++ b/SabreTools.Library/DatItems/DatItem.cs @@ -723,7 +723,9 @@ namespace SabreTools.Library.DatItems // Roms have more infomration to save if (file.Type == ItemType.Rom) { - ((Rom)saveditem).Size = ((Rom)saveditem).Size; + ((Rom)saveditem).Size = (((Rom)saveditem).Size == -1 && ((Rom)file).Size != -1 + ? ((Rom)file).Size + : ((Rom)saveditem).Size); ((Rom)saveditem).CRC = (String.IsNullOrWhiteSpace(((Rom)saveditem).CRC) && !String.IsNullOrWhiteSpace(((Rom)file).CRC) ? ((Rom)file).CRC : ((Rom)saveditem).CRC);