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

Roll back last commit, nevermind.

This commit is contained in:
adelikat 2015-01-06 02:29:30 +00:00
parent f88b5389c1
commit fdc290cc14
2 changed files with 1 additions and 3 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.IsPlaying && Global.MovieSession.Movie.IsRecording)
if (Global.MovieSession != null)
{
Global.MovieOutputHardpoint.Source = Global.MovieSession.MovieControllerAdapter;
}

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

@ -255,8 +255,6 @@ 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();