From 8c2db41b3667f1fe69534d50a37bacd3ef9412d2 Mon Sep 17 00:00:00 2001
From: Flamefire <alex@grundis.de>
Date: Thu, 27 Nov 2014 23:41:34 +0100
Subject: [PATCH] Fix keyboard name selection

---
 Vocaluxe/Screens/CScreenNames.cs | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/Vocaluxe/Screens/CScreenNames.cs b/Vocaluxe/Screens/CScreenNames.cs
index eea5afd1..8b854d28 100644
--- a/Vocaluxe/Screens/CScreenNames.cs
+++ b/Vocaluxe/Screens/CScreenNames.cs
@@ -180,14 +180,15 @@ namespace Vocaluxe.Screens
                                 return true;
 
                             _UpdateSelectedProfile(_SelectingFastPlayerNr - 1, _SelectedProfileID);
-
-                            _SelectElement(_Buttons[_ButtonStart]);
                         }
                         //Started selecting with 'P'
                         if (_SelectingFast)
                         {
                             if (_SelectingFastPlayerNr == CGame.NumPlayers)
+                            {
                                 resetSelection = true;
+                                _SelectElement(_Buttons[_ButtonStart]);
+                            }
                             else
                             {
                                 _SelectingFastPlayerNr++;
@@ -225,6 +226,7 @@ namespace Vocaluxe.Screens
 
                     case Keys.Escape:
                         resetSelection = true;
+                        _SelectElement(_SelectSlides[_SelectSlidePlayerNumber]);
                         break;
 
                     case Keys.Delete:
@@ -323,12 +325,20 @@ namespace Vocaluxe.Screens
                         break;
                 }
 
-
                 if (_SelectingFastPlayerNr > 0 && _SelectingFastPlayerNr <= CConfig.Config.Game.NumPlayers)
                 {
                     _SelectingKeyboardActive = true;
                     _NameSelections[_NameSelection].FastSelection(true, _SelectingFastPlayerNr);
                 }
+                if (_NameSelections[_NameSelection].Selected && !_SelectingKeyboardActive)
+                {
+                    _SelectingKeyboardActive = true;
+                    _ResetPlayerSelections();
+                    _SelectingFast = true;
+                    _SelectingFastPlayerNr = 1;
+                    _SelectingKeyboardActive = true;
+                    _NameSelections[_NameSelection].FastSelection(true, _SelectingFastPlayerNr);
+                }
             }
 
             return true;