Merge pull request ppy#26149 from rushiiMachine/fix-skin-editor-init-…

…fail Fix `SkinEditorOverlay` freezing when `ReplayPlayer` screen exits early
bdach · Feb 22, 2024 · 9018579 · 9018579
2 parents 82b2edd + f9e92c6
commit 9018579
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs b/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
@@ -103,13 +103,14 @@ protected override void PopIn()
         {
             globallyDisableBeatmapSkinSetting();
 
-            if (lastTargetScreen is MainMenu)
-                PresentGameplay();
-
             if (skinEditor != null)
             {
                 disableNestedInputManagers();
                 skinEditor.Show();
+
+                if (lastTargetScreen is MainMenu)
+                    PresentGameplay();
+
                 return;
             }
 
@@ -126,6 +127,9 @@ protected override void PopIn()
 
                 AddInternal(editor);
 
+                if (lastTargetScreen is MainMenu)
+                    PresentGameplay();
+
                 Debug.Assert(lastTargetScreen != null);
 
                 SetTarget(lastTargetScreen);
@@ -270,7 +274,7 @@ private void setTarget(OsuScreen? target)
 
             Debug.Assert(skinEditor != null);
 
-            if (!target.IsLoaded)
+            if (!target.IsLoaded || !skinEditor.IsLoaded)
             {
                 Scheduler.AddOnce(setTarget, target);
                 return;
@@ -350,7 +354,7 @@ protected override void LoadComplete()
                 base.LoadComplete();
 
                 if (!LoadedBeatmapSuccessfully)
-                    Scheduler.AddDelayed(this.Exit, 3000);
+                    Scheduler.AddDelayed(this.Exit, 1000);
             }
 
             protected override void Update()

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
@@ -545,7 +545,7 @@ private IBeatmap loadPlayableBeatmap(Mod[] gameplayMods, CancellationToken cance
 
                 if (playable.HitObjects.Count == 0)
                 {
-                    Logger.Log("Beatmap contains no hit objects!", level: LogLevel.Error);
+                    Logger.Log("Beatmap contains no hit objects!", level: LogLevel.Important);
                     return null;
                 }
             }