From 10c62764bafa6742efbe4243f30856eef7160450 Mon Sep 17 00:00:00 2001 From: adelikat Date: Fri, 12 Jun 2020 11:58:17 -0500 Subject: [PATCH] improve some if checks in OSDManager --- src/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs b/src/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs index 278f0656e2..df2e847b1a 100644 --- a/src/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs +++ b/src/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs @@ -258,7 +258,7 @@ namespace BizHawk.Client.EmuHawk /// public void DrawScreenInfo(IBlitter g) { - if (GlobalWin.Config.DisplayFrameCounter && !GlobalWin.Game.IsNullInstance()) + if (GlobalWin.Config.DisplayFrameCounter && !GlobalWin.Emulator.IsNull()) { string message = MakeFrameCounter(); var point = GetCoordinates(g, GlobalWin.Config.FrameCounter, message); @@ -270,7 +270,7 @@ namespace BizHawk.Client.EmuHawk } } - if (GlobalWin.Config.DisplayInput && !GlobalWin.Game.IsNullInstance()) + if (GlobalWin.Config.DisplayInput) { if (GlobalWin.MovieSession.Movie.IsPlaying() || (GlobalWin.MovieSession.Movie.IsFinished() && GlobalWin.Emulator.Frame == GlobalWin.MovieSession.Movie.InputLogLength)) // Account for the last frame of the movie, the movie state is immediately "Finished" here but we still want to show the input