Merged r8232 to branches/release

TASEmulators · Nov 22, 2014 · 961fc10 · 961fc10
1 parent 2f527f9
commit 961fc10
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/BizHawk.Client.Common/RomLoader.cs b/BizHawk.Client.Common/RomLoader.cs
@@ -333,6 +333,9 @@ private bool PreferredPlatformIsDefined(string extension)
 								core = CoreInventory.Instance[game.System];
 								break;
 
+							case null:
+								// The user picked nothing in the Core picker
+								break;
 							case "SNES":
 								if (Global.Config.SNES_InSnes9x && VersionInfo.DeveloperBuild)
 								{