From 14096c90cc73a03811c58d305ab8db0f6b22c42a Mon Sep 17 00:00:00 2001
From: Aergwyn <aergwyn@t-online.de>
Date: Sun, 3 Dec 2017 16:41:21 +0100
Subject: [PATCH] removed looping if only one song is in the list (temporarily)

It had one problem in relation to SongSelect disabling it when left and in general that topic belongs to another PR.
---
 osu.Game/Overlays/Music/PlaylistList.cs    |  7 ++++++-
 osu.Game/Overlays/Music/PlaylistOverlay.cs | 16 +++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Overlays/Music/PlaylistList.cs b/osu.Game/Overlays/Music/PlaylistList.cs
index af01cdc451..8db4af6fb2 100644
--- a/osu.Game/Overlays/Music/PlaylistList.cs
+++ b/osu.Game/Overlays/Music/PlaylistList.cs
@@ -35,7 +35,11 @@ namespace osu.Game.Overlays.Music
             set { base.Padding = value; }
         }
 
-        public IEnumerable<BeatmapSetInfo> BeatmapSets { set { items.Sets = value; } }
+        public IEnumerable<BeatmapSetInfo> BeatmapSets
+        {
+            get { return items.Sets; }
+            set { items.Sets = value; }
+        }
 
         public BeatmapSetInfo FirstVisibleSet => items.FirstVisibleSet;
         public BeatmapSetInfo NextSet => items.NextSet;
@@ -81,6 +85,7 @@ namespace osu.Game.Overlays.Music
 
             public IEnumerable<BeatmapSetInfo> Sets
             {
+                get { return items.Select(x => x.BeatmapSetInfo).ToList(); }
                 set
                 {
                     items.Clear();
diff --git a/osu.Game/Overlays/Music/PlaylistOverlay.cs b/osu.Game/Overlays/Music/PlaylistOverlay.cs
index 75798bab2d..54b34aaead 100644
--- a/osu.Game/Overlays/Music/PlaylistOverlay.cs
+++ b/osu.Game/Overlays/Music/PlaylistOverlay.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Overlays.Music
 
         private readonly Bindable<WorkingBeatmap> beatmapBacking = new Bindable<WorkingBeatmap>();
 
-        public IEnumerable<BeatmapSetInfo> BeatmapSets;
+        public IEnumerable<BeatmapSetInfo> BeatmapSets => list.BeatmapSets;
 
         [BackgroundDependencyLoader]
         private void load(OsuGameBase game, BeatmapManager beatmaps, OsuColour colours)
@@ -74,11 +74,10 @@ namespace osu.Game.Overlays.Music
                 },
             };
 
-            beatmaps.BeatmapSetAdded += s => Schedule(() => list.AddBeatmapSet(s));
-            beatmaps.BeatmapSetRemoved += s => Schedule(() => list.RemoveBeatmapSet(s));
-
-            list.BeatmapSets = BeatmapSets = beatmaps.GetAllUsableBeatmapSets();
+            beatmaps.BeatmapSetAdded += delegate (BeatmapSetInfo set) { list.AddBeatmapSet(set); };
+            beatmaps.BeatmapSetRemoved += delegate (BeatmapSetInfo set) { list.RemoveBeatmapSet(set); };
 
+            list.BeatmapSets = beatmaps.GetAllUsableBeatmapSets();
 
             beatmapBacking.BindTo(game.Beatmap);
 
@@ -121,7 +120,7 @@ namespace osu.Game.Overlays.Music
                 return;
             }
 
-            playSpecified(set.Beatmaps[0]);
+            playSpecified(set.Beatmaps.First());
         }
 
         public void PlayPrevious()
@@ -130,7 +129,7 @@ namespace osu.Game.Overlays.Music
 
             if (playable != null)
             {
-                playSpecified(playable.Beatmaps[0]);
+                playSpecified(playable.Beatmaps.First());
                 list.SelectedSet = playable;
             }
         }
@@ -141,7 +140,7 @@ namespace osu.Game.Overlays.Music
 
             if (playable != null)
             {
-                playSpecified(playable.Beatmaps[0]);
+                playSpecified(playable.Beatmaps.First());
                 list.SelectedSet = playable;
             }
         }
@@ -149,7 +148,6 @@ namespace osu.Game.Overlays.Music
         private void playSpecified(BeatmapInfo info)
         {
             beatmapBacking.Value = beatmaps.GetWorkingBeatmap(info, beatmapBacking);
-            beatmapBacking.Value.Track.Looping = BeatmapSets?.Count() == 1;
             beatmapBacking.Value.Track.Start();
         }
     }