From 0530816a389cdf2a4fd91c7d5a32cc48d60b40bc Mon Sep 17 00:00:00 2001
From: Florian Kuepper <florian.kueper@googlemail.com>
Date: Mon, 24 Dec 2012 14:44:14 +0100
Subject: [PATCH 1/3] 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())

From 2cb43ae7536ccf3da28951da2a8e616fbb381c62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20K=C3=BCpper?= <florian.kuepper@googlemail.com>
Date: Tue, 25 Dec 2012 22:34:55 +0100
Subject: [PATCH 2/3] Fix search.

---
 Vocaluxe/Screens/CScreenSong.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Vocaluxe/Screens/CScreenSong.cs b/Vocaluxe/Screens/CScreenSong.cs
index ada076ae..fac4cc92 100644
--- a/Vocaluxe/Screens/CScreenSong.cs
+++ b/Vocaluxe/Screens/CScreenSong.cs
@@ -789,13 +789,13 @@ 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)
             {
+                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);

From 00aead7490eaf842fe723c8eca12964e0cb60088 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20K=C3=BCpper?= <florian.kuepper@googlemail.com>
Date: Wed, 26 Dec 2012 14:26:51 +0100
Subject: [PATCH 3/3] Fixed linebreaks in duet.

---
 VocaluxeLib/Menu/SongMenu/CSong.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

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;
                     }