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

Break everything. Seriously, a total cock-up. But also: Fix issue 358, duplicated input after a movie ends. Movie recording isn't obviously horribly busted from this, but just about anything movie related is now possibly busted, if you are looking for some mysterious regression in some movie feature, here's a good place to start!

This commit is contained in:
adelikat 2015-01-06 02:10:21 +00:00
parent 1c2ac16456
commit f88b5389c1
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Client.Common/inputAdapters/InputManager.cs
View File

@ -25,7 +25,7 @@ namespace BizHawk.Client.Common
// connect the movie session before MovieOutputHardpoint if it is doing anything
// otherwise connect the MovieInputSourceAdapter to it, effectively bypassing the movie session
if (Global.MovieSession.Movie != null)
if (Global.MovieSession.Movie.IsPlaying && Global.MovieSession.Movie.IsRecording)
{
Global.MovieOutputHardpoint.Source = Global.MovieSession.MovieControllerAdapter;
}

2
BizHawk.Client.Common/movie/MovieSession.cs
View File

@ -255,6 +255,8 @@ namespace BizHawk.Client.Common
{
LatchInputFromLog();
InputManager.RewireInputChain();
if (Movie.IsRecording) // The movie end situation can cause the switch to record mode, in that case we need to capture some input for this frame
{
HandleFrameLoopForRecordMode();