Redo r8309. Try a different fix for vsync not taking effect at startup.

This commit is contained in:
jdpurcell 2015-01-15 15:56:23 +00:00
parent 69c547bdd7
commit 798f882457
2 changed files with 6 additions and 1 deletions

View File

@ -638,6 +638,11 @@ TESTEROO:
if (LastVsyncSetting != vsync || LastVsyncSettingGraphicsControl != presentationPanel.GraphicsControl)
{
if (LastVsyncSetting == null && vsync)
{
// Workaround for vsync not taking effect at startup (Intel graphics related?)
presentationPanel.GraphicsControl.SetVsync(false);
}
presentationPanel.GraphicsControl.SetVsync(vsync);
LastVsyncSettingGraphicsControl = presentationPanel.GraphicsControl;
LastVsyncSetting = vsync;

View File

@ -1669,7 +1669,7 @@ namespace BizHawk.Client.EmuHawk
// realtime throttle is never going to be so exact that using a double here is wrong
_throttle.SetCoreFps(Global.Emulator.CoreComm.VsyncRate);
_throttle.signal_paused = EmulatorPaused || Global.Emulator.IsNull();
_throttle.signal_paused = EmulatorPaused;
_throttle.signal_unthrottle = _unthrottled || superFastForward;
_throttle.signal_overrideSecondaryThrottle = (fastForward || rewind) && (Global.Config.SoundThrottle || Global.Config.VSyncThrottle || Global.Config.VSync);
_throttle.SetSpeedPercent(speedPercent);