Merge pull request #491 from Vocaluxe/PlaylistNameAndSelectionFix

Fix playlist name display and playlist selection (fix #490)

Vocaluxe/Base/CMain.cs

@@ -964,6 +964,11 @@ namespace Vocaluxe.Base
             CPlaylists.SetName(playlistID, name);
         }
 
+        public List<int> GetIds()
+        {
+            return CPlaylists.Ids;
+        }
+
         public List<string> GetNames()
         {
             return CPlaylists.Names;
@@ -1044,4 +1049,4 @@ namespace Vocaluxe.Base
             return CPlaylists.ContainsSong(playlistID, songID);
         }
     }
-}
+}

VocaluxeLib/IBasic.cs

@@ -304,6 +304,7 @@ namespace VocaluxeLib
     {
         bool Exists(int playlistID);
         string GetName(int playlistID);
+        List<int> GetIds();
         List<string> GetNames();
 
         void SetName(int playlistID, string name);
@@ -336,4 +337,4 @@ namespace VocaluxeLib
         bool IsPlaying();
         float GetLength();
     }
-}
+}

VocaluxeLib/Menu/CMenuPartySongSelection.cs

@@ -100,6 +100,8 @@ namespace VocaluxeLib.Menu
         protected int NumMinMedleySongs = 3;
         protected int NumMaxMedleySongs = 10;
 
+        private List<int> _PlaylistIDs;
+
         public override void Init()
         {
             base.Init();
@@ -188,6 +190,8 @@ namespace VocaluxeLib.Menu
                 _SelectSlides[_SelectSlideSorting].AddValue(ss.ToString());
 
             _SelectSlides[_SelectSlidePlaylist].Clear();
+            _SelectSlides[_SelectSlidePlaylist].NumVisible = 1;  // Make sure that only one playlist at a time will be displayed (or the names overlap)
+            _PlaylistIDs = CBase.Playlist.GetIds();
             List<string> playlists = CBase.Playlist.GetNames();
             for (int i = 0; i < playlists.Count; i++)
             {
@@ -220,7 +224,7 @@ namespace VocaluxeLib.Menu
             _SongMode = _SelectSlides[_SelectSlideSongMode].Selection;
             _Source = _SelectSlides[_SelectSlideSource].Selection;
             NumMedleySongs = NumMinMedleySongs + _SelectSlides[_SelectSlideNumMedleySongs].Selection;
-            Playlist = _SelectSlides[_SelectSlidePlaylist].Selection;
+            Playlist = _PlaylistIDs[_SelectSlides[_SelectSlidePlaylist].Selection];
 
             if (_SelectSlides[_SelectSlideSorting].Selection != _Sorting)
             {