Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into tic-tac-toe

Vocaluxe/Screens/CScreenSong.cs

@@ -84,6 +84,7 @@ namespace Vocaluxe.Screens
         {
             base.Init();
 
+            ButtonsJoker.Clear();
             for (int i = 0; i < _Base.Settings.GetMaxNumPlayer(); i++)
             {
                 ButtonsJoker.Add("ButtonJoker" + (i + 1));
@@ -103,6 +104,7 @@ namespace Vocaluxe.Screens
             blist.Add(ButtonOptionsRandomMedley);
             blist.Add(ButtonOptionsStartMedley);
 
+            TextsPlayer.Clear();
             for (int i = 0; i < _Base.Settings.GetMaxNumPlayer(); i++)
             {
                 TextsPlayer.Add("TextPlayer" + (i + 1));
@@ -203,7 +205,7 @@ namespace Vocaluxe.Screens
                     switch (KeyEvent.Key)
                     {
                         case Keys.Escape:
-                            if ((CSongs.Category < 0 || !(_sso.Sorting.Tabs == EOffOn.TR_CONFIG_OFF)) && !_sso.Selection.PartyMode)
+                            if ((CSongs.Category < 0 || _sso.Sorting.Tabs == EOffOn.TR_CONFIG_OFF) && !_sso.Selection.PartyMode && !_SearchActive)
                                 CGraphics.FadeTo(EScreens.ScreenMain);
                             break;
 
@@ -251,7 +253,7 @@ namespace Vocaluxe.Screens
                                 ApplyNewSearchFilter(_SearchText.Remove(_SearchText.Length - 1));
                             }
 
-                            if (!_SearchActive && (CSongs.Category < 0) && !_sso.Selection.PartyMode)
+                            if ((CSongs.Category < 0 || _sso.Sorting.Tabs == EOffOn.TR_CONFIG_OFF) && !_sso.Selection.PartyMode && !_SearchActive)
                             {
                                 CGraphics.FadeTo(EScreens.ScreenMain);
                             }

VocaluxeLib/Menu/CSelectSlide.cs

@@ -545,7 +545,7 @@ namespace Vocaluxe.Menu
 
         public void AddValue(string value)
         {
-            AddValue(value, new STexture(-1));
+            AddValue(value, new STexture(-1), _PartyModeID);
         }
 
         public void AddValue(string value, int PartyModeID)
@@ -555,12 +555,12 @@ namespace Vocaluxe.Menu
 
         public void AddValue(string value, STexture texture)
         {
-            AddValue(value, texture, _ValueIndexes.Count);
+            AddValue(value, texture, _ValueIndexes.Count, _PartyModeID);
         }
 
         public void AddValue(string value, STexture texture, int valueIndex)
         {
-            AddValue(value, texture, valueIndex, -1);
+            AddValue(value, texture, valueIndex, _PartyModeID);
         }
 
         public void AddValue(string value, STexture texture, int valueIndex, int PartyModeID)
@@ -580,7 +580,7 @@ namespace Vocaluxe.Menu
         {
             foreach (string value in values)
             {
-                AddValue(value, new STexture(-1));
+                AddValue(value, new STexture(-1), _PartyModeID);
             }
 
             _ValueBounds.Clear();