ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

improve some if checks in OSDManager

This commit is contained in:
adelikat 2020-06-12 11:58:17 -05:00
parent 5ef2a4d7e6
commit 10c62764ba
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs
View File

@ -258,7 +258,7 @@ namespace BizHawk.Client.EmuHawk
/// </summary>
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