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

[DatFile, Disk, Rom] Make sure nulls are accounted for

Browse Source
This commit is contained in:
Matt Nadareski
2016-09-19 20:51:18 -07:00
parent 10b74ec550
commit 44b00f9f5a
3 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
SabreTools.Helper/Objects/DatObjects/DatFile.cs
View File

@@ -1866,16 +1866,15 @@ namespace SabreTools.Helper
switch (subreader.Name.ToLowerInvariant()) switch (subreader.Name.ToLowerInvariant())
{ {
case "disk": case "disk":
inrom = new Disk(subreader.GetAttribute("name"), subreader.GetAttribute("md5")?.ToLowerInvariant(), inrom = new Disk(subreader.GetAttribute("name"), subreader.GetAttribute("md5"), subreader.GetAttribute("sha1"),
subreader.GetAttribute("sha1")?.ToLowerInvariant(), isnodump, tempname, null, gamedesc, null, null, isnodump, tempname, null, gamedesc, null, null, romof, cloneof, sampleof, null, false, null, null, sysid,
romof, cloneof, sampleof, null, false, null, null, sysid, filename, srcid, null); filename, srcid, null);
break; break;
case "rom": case "rom":
default: default:
inrom = new Rom(subreader.GetAttribute("name"), size, subreader.GetAttribute("crc")?.ToLowerInvariant(), inrom = new Rom(subreader.GetAttribute("name"), size, subreader.GetAttribute("crc"), subreader.GetAttribute("md5"),
subreader.GetAttribute("md5")?.ToLowerInvariant(), subreader.GetAttribute("sha1")?.ToLowerInvariant(), isnodump, subreader.GetAttribute("sha1"), isnodump, date, tempname, null, gamedesc, null, null, romof, cloneof, sampleof,
date, tempname, null, gamedesc, null, null, romof, cloneof, sampleof, null, false, null, null, sysid, filename, null, false, null, null, sysid, filename, srcid, null);
srcid, null);
break; break;
} }

8
SabreTools.Helper/Objects/DatObjects/Disk.cs
View File

@@ -60,8 +60,8 @@ namespace SabreTools.Helper
{ {
_name = name; _name = name;
_itemType = ItemType.Disk; _itemType = ItemType.Disk;
_md5 = md5.ToLowerInvariant(); _md5 = md5?.ToLowerInvariant();
_sha1 = sha1.ToLowerInvariant(); _sha1 = sha1?.ToLowerInvariant();
_nodump = nodump; _nodump = nodump;
} }
@@ -94,8 +94,8 @@ namespace SabreTools.Helper
{ {
_name = name; _name = name;
_itemType = ItemType.Disk; _itemType = ItemType.Disk;
_md5 = md5.ToLowerInvariant(); _md5 = md5?.ToLowerInvariant();
_sha1 = sha1.ToLowerInvariant(); _sha1 = sha1?.ToLowerInvariant();
_nodump = nodump; _nodump = nodump;
_machineName = machineName; _machineName = machineName;
_comment = comment; _comment = comment;

12
SabreTools.Helper/Objects/DatObjects/Rom.cs
View File

@@ -73,9 +73,9 @@ namespace SabreTools.Helper
_name = name; _name = name;
_itemType = ItemType.Rom; _itemType = ItemType.Rom;
_size = size; _size = size;
_crc = crc.ToLowerInvariant(); _crc = crc?.ToLowerInvariant();
_md5 = md5.ToLowerInvariant(); _md5 = md5?.ToLowerInvariant();
_sha1 = sha1.ToLowerInvariant(); _sha1 = sha1?.ToLowerInvariant();
_nodump = nodump; _nodump = nodump;
_date = date; _date = date;
} }
@@ -113,9 +113,9 @@ namespace SabreTools.Helper
_name = name; _name = name;
_itemType = ItemType.Rom; _itemType = ItemType.Rom;
_size = size; _size = size;
_crc = crc.ToLowerInvariant(); _crc = crc?.ToLowerInvariant();
_md5 = md5.ToLowerInvariant(); _md5 = md5?.ToLowerInvariant();
_sha1 = sha1.ToLowerInvariant(); _sha1 = sha1?.ToLowerInvariant();
_nodump = nodump; _nodump = nodump;
_date = date; _date = date;
_machineName = machineName; _machineName = machineName;