From 3c45746ba10e889f6ca68172d40fa397b448ecb2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Apr 2022 14:29:57 +0900
Subject: [PATCH] Add back schedule for safety

---
 osu.Game/Screens/Play/SongProgress.cs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/SongProgress.cs b/osu.Game/Screens/Play/SongProgress.cs
index 35d70976d2..a21a08e558 100644
--- a/osu.Game/Screens/Play/SongProgress.cs
+++ b/osu.Game/Screens/Play/SongProgress.cs
@@ -175,10 +175,15 @@ namespace osu.Game.Screens.Play
                         if (skinManager.EnsureMutableSkin())
                             return;
 
-                        var skin = skinManager.CurrentSkin.Value;
-                        skin.UpdateDrawableTarget(skinnableTarget);
+                        // If `EnsureMutableSkin` actually changed the skin, default layout may take a frame to apply.
+                        // See `SkinnableTargetComponentsContainer`'s use of ScheduleAfterChildren.
+                        ScheduleAfterChildren(() =>
+                        {
+                            var skin = skinManager.CurrentSkin.Value;
+                            skin.UpdateDrawableTarget(skinnableTarget);
 
-                        skinManager.Save(skin);
+                            skinManager.Save(skin);
+                        });
 
                         configShowGraph.SetDefault();
                     }