Merge branch 'master' into disable-intro-track-pause

osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs

@@ -799,11 +799,7 @@ namespace osu.Game.Tests.Visual.Navigation
                 });
             });
 
-            AddStep("attempt exit", () =>
+            AddRepeatStep("attempt force exit", () => Game.ScreenStack.CurrentScreen.Exit(), 2);
-            {
-                for (int i = 0; i < 2; ++i)
-                    Game.ScreenStack.CurrentScreen.Exit();
-            });
             AddUntilStep("stopped at exit confirm", () => Game.ChildrenOfType<DialogOverlay>().Single().CurrentDialog is ConfirmExitDialog);
         }
 

osu.Game/Online/Leaderboards/Leaderboard.cs

@@ -152,6 +152,15 @@ namespace osu.Game.Online.Leaderboards
         /// </summary>
         public void RefetchScores() => Scheduler.AddOnce(refetchScores);
 
+        /// <summary>
+        /// Clear all scores from the display.
+        /// </summary>
+        public void ClearScores()
+        {
+            cancelPendingWork();
+            SetScores(null);
+        }
+
         /// <summary>
         /// Call when a retrieval or display failure happened to show a relevant message to the user.
         /// </summary>
@@ -220,9 +229,7 @@ namespace osu.Game.Online.Leaderboards
         {
             Debug.Assert(ThreadSafety.IsUpdateThread);
 
-            cancelPendingWork();
+            ClearScores();
-
-            SetScores(null);
             setState(LeaderboardState.Retrieving);
 
             currentFetchCancellationSource = new CancellationTokenSource();

osu.Game/Overlays/Dialog/PopupDialog.cs

@@ -32,7 +32,7 @@ namespace osu.Game.Overlays.Dialog
         private readonly Vector2 ringMinifiedSize = new Vector2(20f);
 
         private readonly Box flashLayer;
-        private Sample flashSample = null!;
+        private Sample? flashSample;
 
         private readonly Container content;
         private readonly Container ring;
@@ -267,7 +267,7 @@ namespace osu.Game.Overlays.Dialog
             flashLayer.FadeInFromZero(80, Easing.OutQuint)
                       .Then()
                       .FadeOutFromOne(1500, Easing.OutQuint);
-            flashSample.Play();
+            flashSample?.Play();
         }
 
         protected override bool OnKeyDown(KeyDownEvent e)

osu.Game/Screens/Menu/MainMenu.cs

@@ -5,6 +5,7 @@
 
 using System;
 using System.Diagnostics;
+using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
@@ -25,6 +26,7 @@ using osu.Game.Input.Bindings;
 using osu.Game.IO;
 using osu.Game.Online.API;
 using osu.Game.Overlays;
+using osu.Game.Overlays.Dialog;
 using osu.Game.Overlays.SkinEditor;
 using osu.Game.Rulesets;
 using osu.Game.Screens.Backgrounds;
@@ -392,7 +394,12 @@ namespace osu.Game.Screens.Menu
             if (requiresConfirmation)
             {
                 if (dialogOverlay.CurrentDialog is ConfirmExitDialog exitDialog)
-                    exitDialog.PerformOkAction();
+                {
+                    if (exitDialog.Buttons.OfType<PopupDialogOkButton>().FirstOrDefault() != null)
+                        exitDialog.PerformOkAction();
+                    else
+                        exitDialog.Flash();
+                }
                 else
                 {
                     dialogOverlay.Push(new ConfirmExitDialog(() =>

osu.Game/Screens/Ranking/Statistics/SoloStatisticsPanel.cs

@@ -37,7 +37,6 @@ namespace osu.Game.Screens.Ranking.Statistics
                     RelativeSizeAxes = Axes.X,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Width = 0.5f,
                     StatisticsUpdate = { BindTarget = StatisticsUpdate }
                 })).ToArray();
             }

osu.Game/Screens/Select/PlaySongSelect.cs

@@ -146,6 +146,14 @@ namespace osu.Game.Screens.Select
             }
         }
 
+        public override void OnSuspending(ScreenTransitionEvent e)
+        {
+            // Scores will be refreshed on arriving at this screen.
+            // Clear them to avoid animation overload on returning to song select.
+            playBeatmapDetailArea.Leaderboard.ClearScores();
+            base.OnSuspending(e);
+        }
+
         public override void OnResuming(ScreenTransitionEvent e)
         {
             base.OnResuming(e);