From fdc290cc1479821bd59ecaac3ab075a8ebb47db2 Mon Sep 17 00:00:00 2001 From: adelikat Date: Tue, 6 Jan 2015 02:29:30 +0000 Subject: [PATCH] Roll back last commit, nevermind. --- BizHawk.Client.Common/inputAdapters/InputManager.cs | 2 +- BizHawk.Client.Common/movie/MovieSession.cs | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/BizHawk.Client.Common/inputAdapters/InputManager.cs b/BizHawk.Client.Common/inputAdapters/InputManager.cs index 4f9f2410d8..3ec8a91613 100644 --- a/BizHawk.Client.Common/inputAdapters/InputManager.cs +++ b/BizHawk.Client.Common/inputAdapters/InputManager.cs @@ -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; } diff --git a/BizHawk.Client.Common/movie/MovieSession.cs b/BizHawk.Client.Common/movie/MovieSession.cs index bb6564bbce..9974976846 100644 --- a/BizHawk.Client.Common/movie/MovieSession.cs +++ b/BizHawk.Client.Common/movie/MovieSession.cs @@ -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();