From c1cdff8505dd03a1f4c6465b1529a1d7abdeb7e6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Sep 2018 19:29:51 +0900
Subject: [PATCH] Add default resolution to avoid crashing

---
 .../Sections/Graphics/LayoutSettings.cs       | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index 548d49bd36..4a8164c6df 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -102,13 +102,18 @@ private void load(FrameworkConfigManager config, OsuGameBase game)
             }, true);
         }
 
-        private IEnumerable<KeyValuePair<string, Size>> getResolutions() =>
-            game.Window?.AvailableResolutions?
-                .Where(r => r.Width >= 800 && r.Height >= 600)
-                .OrderByDescending(r => r.Width)
-                .ThenByDescending(r => r.Height)
-                .Select(res => new KeyValuePair<string, Size>($"{res.Width}x{res.Height}", new Size(res.Width, res.Height)))
-                .Distinct()
-                .ToList() ?? new KeyValuePair<string, Size>("Default", new Size(9999, 9999)).Yield();
+        private IEnumerable<KeyValuePair<string, Size>> getResolutions()
+        {
+            var resolutions = new KeyValuePair<string, Size>("Default", new Size(9999, 9999)).Yield();
+
+            if (game.Window != null)
+                resolutions = resolutions.Concat(game.Window.AvailableResolutions
+                                                     .Where(r => r.Width >= 800 && r.Height >= 600)
+                                                     .OrderByDescending(r => r.Width)
+                                                     .ThenByDescending(r => r.Height)
+                                                     .Select(res => new KeyValuePair<string, Size>($"{res.Width}x{res.Height}", new Size(res.Width, res.Height)))
+                                                     .Distinct()).ToList();
+            return resolutions;
+        }
     }
 }