From e84dab858991fdf0363a93b9269789df4208ce00 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 2 Dec 2020 14:36:52 +0900
Subject: [PATCH] Move new beatmap construction above beat divisor binding

---
 osu.Game/Screens/Edit/Editor.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 8f1cd8e28e..ca7e5fbf20 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -106,15 +106,15 @@ namespace osu.Game.Screens.Edit
         [BackgroundDependencyLoader]
         private void load(OsuColour colours, GameHost host, OsuConfigManager config)
         {
-            beatDivisor.Value = Beatmap.Value.BeatmapInfo.BeatDivisor;
-            beatDivisor.BindValueChanged(divisor => Beatmap.Value.BeatmapInfo.BeatDivisor = divisor.NewValue);
-
             if (Beatmap.Value is DummyWorkingBeatmap)
             {
                 isNewBeatmap = true;
                 Beatmap.Value = beatmapManager.CreateNew(Ruleset.Value, api.LocalUser.Value);
             }
 
+            beatDivisor.Value = Beatmap.Value.BeatmapInfo.BeatDivisor;
+            beatDivisor.BindValueChanged(divisor => Beatmap.Value.BeatmapInfo.BeatDivisor = divisor.NewValue);
+
             // Todo: should probably be done at a DrawableRuleset level to share logic with Player.
             clock = new EditorClock(Beatmap.Value, beatDivisor) { IsCoupled = false };