From b972b8a771b97b622ab74cce1608b82f8e74c658 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Fri, 12 Jun 2020 05:47:23 +1000
Subject: [PATCH] Inline MainForm.IsLagFrame and change global usage in
 OSDManager

---
 src/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs | 2 +-
 src/BizHawk.Client.EmuHawk/MainForm.cs                  | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs b/src/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs
index ad91f51c11..278f0656e2 100644
--- a/src/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs
+++ b/src/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs
@@ -264,7 +264,7 @@ namespace BizHawk.Client.EmuHawk
 				var point = GetCoordinates(g, GlobalWin.Config.FrameCounter, message);
 				DrawOsdMessage(g, message, Color.FromArgb(GlobalWin.Config.MessagesColor), point.X, point.Y);
 
-				if (GlobalWin.MainForm.IsLagFrame)
+				if (GlobalWin.Emulator.CanPollInput() && GlobalWin.Emulator.AsInputPollable().IsLagFrame)
 				{
 					DrawOsdMessage(g, GlobalWin.Emulator.Frame.ToString(), FixedAlertMessageColor, point.X, point.Y);
 				}
diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs
index 0e5a07ff40..f954bfb85f 100644
--- a/src/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/src/BizHawk.Client.EmuHawk/MainForm.cs
@@ -2863,8 +2863,6 @@ namespace BizHawk.Client.EmuHawk
 			PressFrameAdvance = false;
 		}
 
-		public bool IsLagFrame => Emulator.CanPollInput() && Emulator.AsInputPollable().IsLagFrame;
-
 		private void StepRunLoop_Core(bool force = false)
 		{
 			var runFrame = false;
@@ -2874,7 +2872,7 @@ namespace BizHawk.Client.EmuHawk
 			double frameAdvanceTimestampDeltaMs = (double)(currentTimestamp - _frameAdvanceTimestamp) / Stopwatch.Frequency * 1000.0;
 			bool frameProgressTimeElapsed = frameAdvanceTimestampDeltaMs >= Config.FrameProgressDelayMs;
 
-			if (Config.SkipLagFrame && IsLagFrame && frameProgressTimeElapsed && Emulator.Frame > 0)
+			if (Config.SkipLagFrame && Emulator.CanPollInput() && Emulator.AsInputPollable().IsLagFrame && frameProgressTimeElapsed && Emulator.Frame > 0)
 			{
 				runFrame = true;
 			}
@@ -3015,12 +3013,12 @@ namespace BizHawk.Client.EmuHawk
 
 				CheatList.Pulse();
 
-				if (IsLagFrame && Config.AutofireLagFrames)
+				if (Emulator.CanPollInput() && Emulator.AsInputPollable().IsLagFrame && Config.AutofireLagFrames)
 				{
 					InputManager.AutoFireController.IncrementStarts();
 				}
 
-				GlobalWin.InputManager.AutofireStickyXorAdapter.IncrementLoops(IsLagFrame);
+				GlobalWin.InputManager.AutofireStickyXorAdapter.IncrementLoops(Emulator.CanPollInput() && Emulator.AsInputPollable().IsLagFrame);
 
 				PressFrameAdvance = false;