dont fail loading not-in-gamedb psx games

This commit is contained in:
zeromus 2015-07-14 18:52:30 -05:00
parent 0bb994bf1c
commit d7a56eab3b
1 changed files with 2 additions and 2 deletions

View File

@ -270,7 +270,7 @@ namespace BizHawk.Client.Common
{ {
string discHash = new DiscHasher(disc).Calculate_PSX_BizIDHash().ToString("X8"); string discHash = new DiscHasher(disc).Calculate_PSX_BizIDHash().ToString("X8");
game = Database.CheckDatabase(discHash); game = Database.CheckDatabase(discHash);
if (game.IsRomStatusBad()) if (game.IsRomStatusBad() || game.Status == RomStatus.NotInDatabase)
sw.WriteLine("Disc could not be identified as known-good. Look for a better rip."); sw.WriteLine("Disc could not be identified as known-good. Look for a better rip.");
else else
{ {
@ -366,7 +366,7 @@ namespace BizHawk.Client.Common
break; break;
case "PSX": case "PSX":
nextEmulator = new Octoshock(nextComm, new List<Disc>(new[]{disc}), new List<string>(new[]{Path.GetFileNameWithoutExtension(path)}), null, GetCoreSettings<Octoshock>(), GetCoreSyncSettings<Octoshock>()); nextEmulator = new Octoshock(nextComm, new List<Disc>(new[]{disc}), new List<string>(new[]{Path.GetFileNameWithoutExtension(path)}), null, GetCoreSettings<Octoshock>(), GetCoreSyncSettings<Octoshock>());
if (game.IsRomStatusBad()) if (game.IsRomStatusBad() || game.Status == RomStatus.NotInDatabase)
nextEmulator.CoreComm.RomStatusDetails = "Disc could not be identified as known-good. Look for a better rip."; nextEmulator.CoreComm.RomStatusDetails = "Disc could not be identified as known-good. Look for a better rip.";
else else
{ {