psx - fix loading m3u with non-good discs

TASEmulators · Jul 17, 2015 · 1f9f712 · 1f9f712
1 parent 194d988
commit 1f9f712
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/BizHawk.Client.Common/RomLoader.cs b/BizHawk.Client.Common/RomLoader.cs
@@ -270,7 +270,7 @@ public bool LoadRom(string path, CoreComm nextComm, bool forceAccurateCore = fal
 							{
 								string discHash = new DiscHasher(disc).Calculate_PSX_BizIDHash().ToString("X8");
 								game = Database.CheckDatabase(discHash);
-								if (game.IsRomStatusBad() || game.Status == RomStatus.NotInDatabase)
+								if (game == null || game.IsRomStatusBad() || game.Status == RomStatus.NotInDatabase)
 									sw.WriteLine("Disc could not be identified as known-good. Look for a better rip.");
 								else
 								{