dont crash throttling nullemulator

This commit is contained in:
zeromus 2011-09-16 00:40:33 +00:00
parent 7a272192fb
commit e68acda91d
1 changed files with 10 additions and 7 deletions

View File

@ -301,6 +301,8 @@ namespace BizHawk.MultiClient
bool fastforward = Global.ClientControls["Fast Forward"]; bool fastforward = Global.ClientControls["Fast Forward"];
Global.ForceNoVsync = unthrottled || fastforward; Global.ForceNoVsync = unthrottled || fastforward;
throttle.SetCoreFps(Global.Emulator.CoreOutputComm.VsyncRate);
throttle.signal_unthrottle = unthrottled; throttle.signal_unthrottle = unthrottled;
if (fastforward) if (fastforward)
throttle.SetSpeedPercent(Global.Config.SpeedPercentAlternate); throttle.SetSpeedPercent(Global.Config.SpeedPercentAlternate);
@ -338,7 +340,8 @@ namespace BizHawk.MultiClient
StepRunLoop_Core(); StepRunLoop_Core();
StepRunLoop_Throttle(); //if(!IsNullEmulator())
StepRunLoop_Throttle();
Render(); Render();
@ -1088,12 +1091,12 @@ namespace BizHawk.MultiClient
if (File.Exists(PathManager.SaveRamPath(game))) if (File.Exists(PathManager.SaveRamPath(game)))
LoadSaveRam(); LoadSaveRam();
//setup the throttle based on platform's specifications ////setup the throttle based on platform's specifications
//(one day later for some systems we will need to modify it at runtime as the display mode changes) ////(one day later for some systems we will need to modify it at runtime as the display mode changes)
{ //{
throttle.SetCoreFps(Global.Emulator.CoreOutputComm.VsyncRate); // throttle.SetCoreFps(Global.Emulator.CoreOutputComm.VsyncRate);
SyncThrottle(); // SyncThrottle();
} //}
RamSearch1.Restart(); RamSearch1.Restart();
RamWatch1.Restart(); RamWatch1.Restart();
HexEditor1.Restart(); HexEditor1.Restart();