From 0530816a389cdf2a4fd91c7d5a32cc48d60b40bc Mon Sep 17 00:00:00 2001 From: Florian Kuepper Date: Mon, 24 Dec 2012 14:44:14 +0100 Subject: [PATCH] Fixed bug in party-mode with opened playlist. --- Vocaluxe/Screens/CScreenSong.cs | 3 ++- VocaluxeLib/Menu/CPlaylist.cs | 16 +++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Vocaluxe/Screens/CScreenSong.cs b/Vocaluxe/Screens/CScreenSong.cs index 28bbf9ed..ada076ae 100644 --- a/Vocaluxe/Screens/CScreenSong.cs +++ b/Vocaluxe/Screens/CScreenSong.cs @@ -796,7 +796,8 @@ namespace Vocaluxe.Screens if (_sso.Selection.PartyMode) { - _PlaylistActive = false; + ClosePlaylist(); + Playlists[htPlaylists(Playlist)].ClosePlaylist(); ToggleSongOptions(ESongOptionsView.None); } diff --git a/VocaluxeLib/Menu/CPlaylist.cs b/VocaluxeLib/Menu/CPlaylist.cs index 27d529cb..b80cbf1d 100644 --- a/VocaluxeLib/Menu/CPlaylist.cs +++ b/VocaluxeLib/Menu/CPlaylist.cs @@ -1193,6 +1193,15 @@ namespace Vocaluxe.Menu Update(); } + + public void ClosePlaylist() + { + Visible = false; + Selected = false; + ActivePlaylistID = -1; + } + + private void StartPlaylistSongs() { _Base.Game.Reset(); @@ -1220,13 +1229,6 @@ namespace Vocaluxe.Menu _Base.Graphics.FadeTo(EScreens.ScreenNames); } - private void ClosePlaylist() - { - Visible = false; - Selected = false; - ActivePlaylistID = -1; - } - public void Update() { if (ActivePlaylistID > -1 && ActivePlaylistID < _Base.Playlist.GetNumPlaylists())