From 3232a1e98929e02f2d67ea63fba9b501edea7105 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20K=C3=BCpper?= <florian.kuepper@googlemail.com>
Date: Sat, 27 Apr 2013 17:50:02 +0200
Subject: [PATCH] Reset selected players before activating fast-selection.

---
 Vocaluxe/Screens/CScreenNames.cs | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/Vocaluxe/Screens/CScreenNames.cs b/Vocaluxe/Screens/CScreenNames.cs
index e104e317..99006246 100644
--- a/Vocaluxe/Screens/CScreenNames.cs
+++ b/Vocaluxe/Screens/CScreenNames.cs
@@ -140,6 +140,7 @@ namespace Vocaluxe.Screens
                     {
                         _SelectingFastPlayerNr = 1;
                         _SelectingFast = true;
+                        _ResetPlayerSelections();
                     }
                     else
                     {
@@ -570,6 +571,7 @@ namespace Vocaluxe.Screens
             }
             else if(mouseEvent.MB)
             {
+                _ResetPlayerSelections();
                 _SelectingFast = true;
                 _SelectingFastPlayerNr = 1;
                 _SelectingKeyboardActive = true;
@@ -706,6 +708,21 @@ namespace Vocaluxe.Screens
             _CheckPlayers();
         }
 
+        private void _ResetPlayerSelections()
+        {
+            for (int i = 0; i < CGame.NumPlayer; i++)
+            {
+                CGame.Players[i].ProfileID = -1;
+                //Update config for default players.
+                CConfig.Players[i] = String.Empty;
+                //Update texture and name
+                _Statics[_StaticPlayerAvatar[i]].Texture = _OriginalPlayerAvatarTextures[i];
+                _Texts[_TextPlayer[i]].Text = CProfiles.GetPlayerName(-1, i + 1);
+            }
+            _NameSelections[_NameSelection].UpdateList();
+            CConfig.SaveConfig();
+        }
+
         private void _CheckMics()
         {
             List<int> playerWithoutMicro = new List<int>();