diff --git a/Vocaluxe/Screens/CScreenSong.cs b/Vocaluxe/Screens/CScreenSong.cs index 28bbf9ed..fac4cc92 100644 --- a/Vocaluxe/Screens/CScreenSong.cs +++ b/Vocaluxe/Screens/CScreenSong.cs @@ -789,14 +789,15 @@ namespace Vocaluxe.Screens } _sso = CParty.GetSongSelectionOptions(); - CSongs.Sort(_sso.Sorting.SongSorting, _sso.Sorting.Tabs, _sso.Sorting.IgnoreArticles, _sso.Sorting.SearchString, _sso.Sorting.ShowDuetSongs); - _SearchActive = _sso.Sorting.SearchStringVisible; - _SearchText = _sso.Sorting.SearchString; if (_sso.Selection.PartyMode) { - _PlaylistActive = false; + CSongs.Sort(_sso.Sorting.SongSorting, _sso.Sorting.Tabs, _sso.Sorting.IgnoreArticles, _sso.Sorting.SearchString, _sso.Sorting.ShowDuetSongs); + _SearchActive = _sso.Sorting.SearchStringVisible; + _SearchText = _sso.Sorting.SearchString; + 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()) diff --git a/VocaluxeLib/Menu/SongMenu/CSong.cs b/VocaluxeLib/Menu/SongMenu/CSong.cs index daeffcee..ea4316e5 100644 --- a/VocaluxeLib/Menu/SongMenu/CSong.cs +++ b/VocaluxeLib/Menu/SongMenu/CSong.cs @@ -735,7 +735,15 @@ namespace Vocaluxe.Menu.SongMenu char chr = (char)sr.Read(); Param1 = CHelper.TryReadInt(sr); - NewSentence(Player, Param1); + if(Player != 2) + // one singer + NewSentence(Player, Param1); + else + { + // both singer + NewSentence(0, Param1); + NewSentence(1, Param1); + } isNewSentence = true; }