Merge pull request #2679 from peppy/fix-player-life-management

Fix player life management

osu.Game/Screens/Play/PlayerLoader.cs

@@ -209,8 +209,11 @@ protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
 
-            // if the player never got pushed, we should explicitly dispose it.
-            loadTask?.ContinueWith(_ => player.Dispose());
+            if (isDisposing)
+            {
+                // if the player never got pushed, we should explicitly dispose it.
+                loadTask?.ContinueWith(_ => player.Dispose());
+            }
         }
 
         private class BeatmapMetadataDisplay : Container

osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs

@@ -51,7 +51,7 @@ private void load(SongSelect songSelect, BeatmapManager manager, BeatmapSetOverl
 
             if (songSelect != null)
             {
-                startRequested = songSelect.FinaliseSelection;
+                startRequested = b => songSelect.FinaliseSelection(b);
                 editRequested = songSelect.Edit;
             }
 

osu.Game/Screens/Select/EditSongSelect.cs

@@ -7,7 +7,7 @@ public class EditSongSelect : SongSelect
     {
         protected override bool ShowFooter => false;
 
-        protected override bool OnSelectionFinalised()
+        protected override bool OnStart()
         {
             Exit();
             return true;

osu.Game/Screens/Select/MatchSongSelect.cs

@@ -5,7 +5,7 @@ namespace osu.Game.Screens.Select
 {
     public class MatchSongSelect : SongSelect
     {
-        protected override bool OnSelectionFinalised()
+        protected override bool OnStart()
         {
             Schedule(() =>
             {

osu.Game/Screens/Select/PlaySongSelect.cs

@@ -137,7 +137,7 @@ protected override bool OnExiting(Screen next)
             return false;
         }
 
-        protected override bool OnSelectionFinalised()
+        protected override bool OnStart()
         {
             if (player != null) return false;
 

osu.Game/Screens/Select/SongSelect.cs

@@ -227,7 +227,8 @@ public void Edit(BeatmapInfo beatmap)
         /// Call to make a selection and perform the default action for this SongSelect.
         /// </summary>
         /// <param name="beatmap">An optional beatmap to override the current carousel selection.</param>
-        public void FinaliseSelection(BeatmapInfo beatmap = null)
+        /// <param name="performStartAction">Whether to trigger <see cref="OnStart"/>.</param>
+        public void FinaliseSelection(BeatmapInfo beatmap = null, bool performStartAction = true)
         {
             // if we have a pending filter operation, we want to run it now.
             // it could change selection (ie. if the ruleset has been changed).
@@ -243,14 +244,15 @@ public void FinaliseSelection(BeatmapInfo beatmap = null)
                 selectionChangedDebounce = null;
             }
 
-            OnSelectionFinalised();
+            if (performStartAction)
+                OnStart();
         }
 
         /// <summary>
         /// Called when a selection is made.
         /// </summary>
         /// <returns>If a resultant action occurred that takes the user away from SongSelect.</returns>
-        protected abstract bool OnSelectionFinalised();
+        protected abstract bool OnStart();
 
         private ScheduledDelegate selectionChangedDebounce;
 
@@ -395,7 +397,7 @@ protected override void OnSuspending(Screen next)
 
         protected override bool OnExiting(Screen next)
         {
-            FinaliseSelection();
+            FinaliseSelection(performStartAction: false);
 
             beatmapInfoWedge.State = Visibility.Hidden;