ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix so that rewind only sends bizhawk into play mode if it was in record mode previously

This commit is contained in:
adelikat 2012-05-30 00:52:08 +00:00
parent c3a4b12ca9
commit 9d5e4d9451
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
BizHawk.MultiClient/MainForm.cs
View File

@ -1780,7 +1780,7 @@ namespace BizHawk.MultiClient
runFrame = true;
}
MOVIEMODE movieMode = Global.MovieSession.Movie.Mode;
bool ReturnToRecording = Global.MovieSession.Movie.Mode == MOVIEMODE.RECORD;
if (Global.Config.RewindEnabled && (Global.ClientControls["Rewind"] || PressRewind))
{
Rewind(1);
@ -1793,9 +1793,9 @@ namespace BizHawk.MultiClient
{
runFrame = true;
}
//Save this here and restore it later, we don't want to capture input when rewinding, even in record mode
movieMode = Global.MovieSession.Movie.Mode;
Global.MovieSession.Movie.Mode = MOVIEMODE.PLAY;
//we don't want to capture input when rewinding, even in record mode
if (Global.MovieSession.Movie.Mode == MOVIEMODE.RECORD)
Global.MovieSession.Movie.Mode = MOVIEMODE.PLAY;
}
bool genSound = false;
@ -1920,7 +1920,8 @@ namespace BizHawk.MultiClient
if (Global.ClientControls["Rewind"] || PressRewind)
{
UpdateToolsAfter();
Global.MovieSession.Movie.Mode = movieMode;
if (ReturnToRecording)
Global.MovieSession.Movie.Mode = MOVIEMODE.RECORD;
PressRewind = false;
}