From cc15bb2841edc3b4644a75d39ee14334eb5ea030 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Tue, 14 Apr 2020 17:47:49 -0500
Subject: [PATCH] fix some object churning when input display is on

---
 BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs b/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs
index c7565db935..021d00cb2a 100644
--- a/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs
+++ b/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs
@@ -212,11 +212,14 @@ namespace BizHawk.Client.EmuHawk
 
 		public string InputStrOrAll()
 		{
-			var m = Global.MovieSession.Movie.IsPlayingOrRecording() && Global.Emulator.Frame > 0
-				? Global.MovieSession.Movie.GetInputState(Global.Emulator.Frame - 1)
-				: Global.MovieSession.MovieControllerInstance();
+			IController m = Global.InputManager.AutofireStickyXorAdapter;
 
-			return MakeStringFor(Global.InputManager.AutofireStickyXorAdapter.Or(m));
+			if (Global.MovieSession.Movie.IsPlayingOrRecording() && Global.Emulator.Frame > 0)
+			{
+				m = m.Or(Global.MovieSession.Movie.GetInputState(Global.Emulator.Frame - 1));
+			}
+
+			return MakeStringFor(m);
 		}
 
 		private string MakeStringFor(IController controller)