From 249e64bdbb7f4cba73fe9349a293a42884f1c498 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Fri, 6 Oct 2017 17:49:47 -0700 Subject: [PATCH] [DatFile, RombaSharp] Fix build errors --- RombaSharp/Partials/RombaSharp.Helpers.cs | 2 +- SabreTools.Library/Dats/Partials/DatFile.DFD.cs | 15 ++------------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/RombaSharp/Partials/RombaSharp.Helpers.cs b/RombaSharp/Partials/RombaSharp.Helpers.cs index 2bd84df1..635084ed 100644 --- a/RombaSharp/Partials/RombaSharp.Helpers.cs +++ b/RombaSharp/Partials/RombaSharp.Helpers.cs @@ -472,7 +472,7 @@ namespace RombaSharp private static void AddDatToDatabase(Rom dat, SqliteConnection dbc) { // Get the dat full path - string fullpath = Path.Combine(_dats, (dat.Machine.Name == "dats" ? "" : dat.Machine.Name), dat.Name); + string fullpath = Path.Combine(_dats, (dat.MachineName == "dats" ? "" : dat.MachineName), dat.Name); // Parse the Dat if possible Globals.Logger.User("Adding from '" + dat.Name + "'"); diff --git a/SabreTools.Library/Dats/Partials/DatFile.DFD.cs b/SabreTools.Library/Dats/Partials/DatFile.DFD.cs index 11200a9d..726eb638 100644 --- a/SabreTools.Library/Dats/Partials/DatFile.DFD.cs +++ b/SabreTools.Library/Dats/Partials/DatFile.DFD.cs @@ -402,19 +402,8 @@ namespace SabreTools.Library.Dats // Update rom information datItem.Name = romname; - if (datItem.Machine == default(Machine)) - { - datItem.Machine = new Machine - { - Name = gamename, - Description = gamename, - }; - } - else - { - datItem.Machine.UpdateName(gamename); - datItem.Machine.UpdateDescription(gamename); - } + datItem.MachineName = gamename; + datItem.Description = gamename; // Add the file information to the DAT Add(key, datItem);