[SabreTools, DatItem] Code cleanup as recommended

This commit is contained in:
Matt Nadareski
2017-02-27 21:54:34 -08:00
parent 5737fd5175
commit 11293f8ca5
2 changed files with 9 additions and 7 deletions

View File

@@ -559,7 +559,7 @@ namespace SabreTools.Helper.Dats
Disk disk = (Disk)datItem;
disk.Name += "_" + (!String.IsNullOrEmpty(disk.MD5) ? disk.MD5 : disk.SHA1);
datItem = disk;
lastrenamed = lastrenamed == null ? datItem.Name : lastrenamed;
lastrenamed = lastrenamed ?? datItem.Name;
}
else if (datItem.Type == ItemType.Rom)
{
@@ -568,7 +568,7 @@ namespace SabreTools.Helper.Dats
!String.IsNullOrEmpty(rom.MD5) ? rom.MD5 :
!String.IsNullOrEmpty(rom.SHA1) ? rom.SHA1 : "(alt)");
datItem = rom;
lastrenamed = lastrenamed == null ? datItem.Name : lastrenamed;
lastrenamed = lastrenamed ?? datItem.Name;
}
// If we have a conflict with the last renamed item, do the right thing