Fix turbo mode not disabling sound rendering (broken by 68a362c).

Apply FF&RW volume when unthrottled.
This commit is contained in:
J.D. Purcell 2016-12-20 22:41:59 -05:00
parent 62f674a8f7
commit 52d604cb24
1 changed files with 3 additions and 2 deletions

View File

@ -2765,7 +2765,7 @@ namespace BizHawk.Client.EmuHawk
if (runFrame || force)
{
var isFastForwarding = Global.ClientControls["Fast Forward"] || IsTurboing;
var isFastForwardingOrRewinding = isFastForwarding || isRewinding;
var isFastForwardingOrRewinding = isFastForwarding || isRewinding || _unthrottled;
if (isFastForwardingOrRewinding != _lastFastForwardingOrRewinding)
{
@ -2825,8 +2825,9 @@ namespace BizHawk.Client.EmuHawk
Global.MovieSession.HandleMovieOnFrameLoop();
//why not skip audio if the user doesnt want sound
bool renderSound = Global.Config.SoundEnabled || !IsTurboing;
bool renderSound = Global.Config.SoundEnabled && !IsTurboing;
renderSound |= (_currAviWriter != null && _currAviWriter.UsesAudio);
if (!renderSound) atten = 0;
bool render = !_throttle.skipnextframe || (_currAviWriter != null && _currAviWriter.UsesVideo);
Emulator.FrameAdvance(render, renderSound);