Added better playlist Open-Option

Fixed Bug with GameModes

Vocaluxe/GameModes/CGameMode.cs

@@ -6,7 +6,7 @@ namespace Vocaluxe.GameModes
     abstract class CGameMode : IGameMode
     {
         private CSong _LastSong;
-        private int _LastSongID;
+        private int _LastSongID = -1;
 
         public CSong GetSong(int songID)
         {

Vocaluxe/Screens/CScreenSong.cs

@@ -338,7 +338,9 @@ namespace Vocaluxe.Screens
                         else if (_Buttons[_ButtonOptionsOpenSelectedItem].Selected)
                             _HandleSelectButton();
                         else if (_SelectSlides[_SelectSlideOptionsPlaylistOpen].Selected)
-                            _OpenPlaylistAction();
+                            _OpenPlaylist(_SelectSlides[_SelectSlideOptionsPlaylistOpen].Selection);
+                        else if (_SelectSlides[_SelectSlideOptionsPlaylistAdd].Selected)
+                            _OpenPlaylist(_SelectSlides[_SelectSlideOptionsPlaylistAdd].Selection - 1);
                         else if (_Buttons[_ButtonOptionsRandomMedley].Selected)
                             _ToggleSongOptions(ESongOptionsView.Medley);
                         else if (_Buttons[_ButtonOptionsStartMedley].Selected)
@@ -515,7 +517,12 @@ namespace Vocaluxe.Screens
                     }
                     else if (_SelectSlides[_SelectSlideOptionsPlaylistOpen].ValueSelected)
                     {
-                        _OpenPlaylistAction();
+                        _OpenPlaylist(_SelectSlides[_SelectSlideOptionsPlaylistOpen].Selection);
+                        return true;
+                    }
+                    else if (_SelectSlides[_SelectSlideOptionsPlaylistAdd].ValueSelected)
+                    {
+                        _OpenPlaylist(_SelectSlides[_SelectSlideOptionsPlaylistAdd].Selection - 1);
                         return true;
                     }
                     else if (_Buttons[_ButtonOptionsRandomMedley].Selected)
@@ -832,15 +839,12 @@ namespace Vocaluxe.Screens
         {
             if ((CSongs.Category >= 0) && (songNr >= 0))
             {
-                EGameMode gm;
-                if (CSongs.VisibleSongs[songNr].Medley.Source != EMedleySource.None)
-                    gm = EGameMode.TR_GAMEMODE_MEDLEY;
-                else
+                if (CSongs.VisibleSongs[songNr].Medley.Source == EMedleySource.None)
                     return;
 
                 CGame.Reset();
                 CGame.ClearSongs();
-                CGame.AddVisibleSong(songNr, gm);
+                CGame.AddVisibleSong(songNr, EGameMode.TR_GAMEMODE_MEDLEY);
 
                 CGraphics.FadeTo(EScreens.ScreenNames);
             }
@@ -1097,7 +1101,6 @@ namespace Vocaluxe.Screens
             EGameMode lastMode = EGameMode.TR_GAMEMODE_NORMAL;
             if (_AvailableGameModes.Count > 0)
                 lastMode = _AvailableGameModes[_SelectSlides[_SelectSlideOptionsMode].Selection];
-            _SetInteractionToButton(_Buttons[_ButtonOptionsSing]);
             _AvailableGameModes.Clear();
             _SelectSlides[_SelectSlideOptionsMode].Clear();
             if (CSongs.VisibleSongs[_SongMenus[_SongMenu].GetSelectedSong()].IsDuet)
@@ -1183,11 +1186,12 @@ namespace Vocaluxe.Screens
 
         private void _OpenPlaylist(int playlistID)
         {
-            if (CPlaylists.Playlists.Length > playlistID && playlistID > -1)
+            if (CPlaylists.Playlists.Length > playlistID && playlistID >= 0)
             {
                 _Playlists[_Playlist].LoadPlaylist(playlistID);
                 _SongMenus[_SongMenu].SetSmallView(true);
                 _Playlists[_Playlist].Visible = true;
+                _SetSelectSlidePlaylistToCurrentPlaylist();
             }
         }
 
@@ -1212,19 +1216,6 @@ namespace Vocaluxe.Screens
             _SelectSlides[_SelectSlideOptionsPlaylistOpen].AddValues(CPlaylists.PlaylistNames);
         }
 
-        private void _OpenPlaylistAction()
-        {
-            //Open a playlist
-            if (_Playlists[_Playlist].ActivePlaylistID != _SelectSlides[_SelectSlideOptionsPlaylistOpen].Selection)
-            {
-                _Playlists[_Playlist].ActivePlaylistID = _SelectSlides[_SelectSlideOptionsPlaylistOpen].Selection;
-                _SetSelectSlidePlaylistToCurrentPlaylist();
-
-                //Open playlist
-                _OpenPlaylist(_Playlists[_Playlist].ActivePlaylistID);
-            }
-        }
-
         private void _OpenAndAddPlaylistAction()
         {
             //Open an existing playlist and add song

Vocaluxe/SongQueue/CSongQueue.cs

@@ -145,7 +145,7 @@ namespace Vocaluxe.SongQueue
         public CSong GetSong()
         {
             if (_CurrentSong >= 0 && _CurrentSong < _SongQueue.Count)
-                CGameModes.Get(GetCurrentGameMode()).GetSong(_SongQueue[_CurrentSong].SongID);
+                return CGameModes.Get(_SongQueue[_CurrentSong].GameMode).GetSong(_SongQueue[_CurrentSong].SongID);
             return null;
         }