Gameboy - fix the assigning of the active controller/autofire controller when loading a gameboy core (fixes crash when attempting to run a gameboy game)

This commit is contained in:
adelikat 2012-05-16 03:14:50 +00:00
parent 7ab8fe087a
commit 9c5f56308b
1 changed files with 3 additions and 1 deletions

View File

@ -1037,6 +1037,8 @@ namespace BizHawk.MultiClient
Global.AutoFireController = Global.AutofireNESControls;
break;
case "GB":
Global.ActiveController = Global.GBControls;
Global.AutoFireController = Global.AutofireGBControls;
break;
case "COLV":
Global.ActiveController = Global.ColecoControls;
@ -1253,7 +1255,7 @@ namespace BizHawk.MultiClient
nextEmulator = gb;
break;
case "COLV":
ColecoVision c = new ColecoVision(game, rom.FileData);
SMS c = new SMS(game, rom.RomData);//new ColecoVision(game, rom.FileData);
nextEmulator = c;
break;
}