ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/TASVideos/bizhawk

This commit is contained in:
adelikat 2015-07-14 20:40:41 -04:00
parent c70c59ed76 d7a56eab3b
commit 587f0293b9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.Client.Common/RomLoader.cs
View File

@ -270,7 +270,7 @@ namespace BizHawk.Client.Common
{
string discHash = new DiscHasher(disc).Calculate_PSX_BizIDHash().ToString("X8");
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.");
else
{
@ -366,7 +366,7 @@ namespace BizHawk.Client.Common
break;
case "PSX":
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.";
else
{