From 7ff91c234e51a901c34a0b8ec95a5730f71fb028 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sun, 7 Jun 2020 08:47:39 -0500
Subject: [PATCH] InputManager - remove a null check on movie session, it will
 never be null

---
 .../inputAdapters/InputManager.cs                    | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/BizHawk.Client.Common/inputAdapters/InputManager.cs b/src/BizHawk.Client.Common/inputAdapters/InputManager.cs
index b7f847dcfc..0f4ba770f1 100644
--- a/src/BizHawk.Client.Common/inputAdapters/InputManager.cs
+++ b/src/BizHawk.Client.Common/inputAdapters/InputManager.cs
@@ -79,16 +79,8 @@ namespace BizHawk.Client.Common
 
 			Global.MovieSession.RecreateMovieController(MovieInputSourceAdapter.Definition);
 
-			// 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 != null)
-			{
-				MovieOutputHardpoint.Source = Global.MovieSession.MovieController;
-			}
-			else
-			{
-				MovieOutputHardpoint.Source = MovieInputSourceAdapter;
-			}
+			// connect the movie session before MovieOutputHardpoint
+			MovieOutputHardpoint.Source = Global.MovieSession.MovieController;
 		}
 
 		private static Controller BindToDefinition(ControllerDefinition def, IDictionary<string, Dictionary<string, string>> allBinds, IDictionary<string, Dictionary<string, AnalogBind>> analogBinds)