From d0d2e41b28df281507e16d5de19f4ec0c5e8a8b7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Jan 2021 18:19:28 +0900
Subject: [PATCH] Fix display settings binding to configuration bindables in
 async load

---
 .../Settings/Sections/Graphics/LayoutSettings.cs    | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index 3d3b543d70..e815e2f68b 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -133,6 +133,15 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                 },
             };
 
+            scalingSettings.ForEach(s => bindPreviewEvent(s.Current));
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            windowModeDropdown.Current.ValueChanged += _ => updateResolutionDropdown();
+
             windowModes.BindCollectionChanged((sender, args) =>
             {
                 if (windowModes.Count > 1)
@@ -141,8 +150,6 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                     windowModeDropdown.Hide();
             }, true);
 
-            windowModeDropdown.Current.ValueChanged += _ => updateResolutionDropdown();
-
             currentDisplay.BindValueChanged(display => Schedule(() =>
             {
                 resolutions.RemoveRange(1, resolutions.Count - 1);
@@ -159,8 +166,6 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                 updateResolutionDropdown();
             }), true);
 
-            scalingSettings.ForEach(s => bindPreviewEvent(s.Current));
-
             scalingMode.BindValueChanged(mode =>
             {
                 scalingSettings.ClearTransforms();