fix occasional crash in throttle due to a funky order of operations

This commit is contained in:
zeromus 2011-06-21 08:36:49 +00:00
parent 6cca2a666a
commit 453b02a7ff
1 changed files with 6 additions and 2 deletions

View File

@ -144,16 +144,20 @@ namespace BizHawk.MultiClient
public void SetCoreFps(double desired_fps) public void SetCoreFps(double desired_fps)
{ {
core_desiredfps = (ulong)(65536 * desired_fps); core_desiredfps = (ulong)(65536 * desired_fps);
SetSpeedPercent(pct); int target_pct = pct;
pct = -1;
SetSpeedPercent(target_pct);
} }
int pct = -1; int pct = -1;
public void SetSpeedPercent(int percent) public void SetSpeedPercent(int percent)
{ {
if (pct == percent) return; //Console.WriteLine("throttle set percent " + percent);
if (pct == percent) return;
pct = percent; pct = percent;
float fraction = percent / 100.0f; float fraction = percent / 100.0f;
desiredfps = (ulong)(core_desiredfps * fraction); desiredfps = (ulong)(core_desiredfps * fraction);
//Console.WriteLine("throttle set desiredfps " + desiredfps);
desiredspf = 65536.0f / desiredfps; desiredspf = 65536.0f / desiredfps;
AutoFrameSkip_IgnorePreviousDelay(); AutoFrameSkip_IgnorePreviousDelay();
} }