From b924aa3296bbc6ccb9c6cf0f1f4140580ffc833b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 8 Jun 2022 00:36:19 +0900
Subject: [PATCH] Fix tests failing when run headless

---
 .../Visual/Settings/TestSceneLatencyCertifierScreen.cs        | 3 ++-
 osu.Game/Screens/Utility/LatencyCertifierScreen.cs            | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneLatencyCertifierScreen.cs b/osu.Game.Tests/Visual/Settings/TestSceneLatencyCertifierScreen.cs
index 687d7c490c..6d8c6d3c54 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneLatencyCertifierScreen.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneLatencyCertifierScreen.cs
@@ -19,7 +19,9 @@ namespace osu.Game.Tests.Visual.Settings
         public override void SetUpSteps()
         {
             base.SetUpSteps();
+
             AddStep("Load screen", () => LoadScreen(latencyCertifier = new LatencyCertifierScreen()));
+            AddUntilStep("wait for load", () => latencyCertifier.IsLoaded);
         }
 
         [Test]
@@ -33,7 +35,6 @@ namespace osu.Game.Tests.Visual.Settings
             }
 
             AddAssert("check at results", () => !latencyCertifier.ChildrenOfType<LatencyArea>().Any());
-
             AddAssert("check no buttons", () => !latencyCertifier.ChildrenOfType<OsuButton>().Any());
         }
 
diff --git a/osu.Game/Screens/Utility/LatencyCertifierScreen.cs b/osu.Game/Screens/Utility/LatencyCertifierScreen.cs
index 157998184c..568e477d8f 100644
--- a/osu.Game/Screens/Utility/LatencyCertifierScreen.cs
+++ b/osu.Game/Screens/Utility/LatencyCertifierScreen.cs
@@ -190,7 +190,7 @@ Do whatever you need to try and perceive the difference in latency, then choose
         {
             mainArea.Clear();
 
-            var displayMode = host.Window.CurrentDisplayMode.Value;
+            var displayMode = host.Window?.CurrentDisplayMode.Value;
 
             string exclusive = "unknown";
 
@@ -217,7 +217,7 @@ Do whatever you need to try and perceive the difference in latency, then choose
                 statusText.AddParagraph(string.Empty);
             }
 
-            statusText.AddParagraph($"Polling: {pollingMax} hz Monitor: {displayMode.RefreshRate:N0} hz Exclusive: {exclusive}", cp => cp.Font = OsuFont.Default.With(size: 15));
+            statusText.AddParagraph($"Polling: {pollingMax} hz Monitor: {displayMode?.RefreshRate ?? 0:N0} hz Exclusive: {exclusive}", cp => cp.Font = OsuFont.Default.With(size: 15));
 
             statusText.AddParagraph($"Input: {host.InputThread.Clock.FramesPerSecond} hz "
                                     + $"Update: {host.UpdateThread.Clock.FramesPerSecond} hz "