From ba2e579b547b5331a2bcd900de04ae50818ada84 Mon Sep 17 00:00:00 2001
From: s_alexander <s_alexander@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sun, 6 Dec 2009 14:40:10 +0000
Subject: fix bugtracker issue 2817034

if selected to show the name screen after song select, than this screen
is now not shown before song select

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1975 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/screens/UScreenMain.pas | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/screens/UScreenMain.pas')

diff --git a/src/screens/UScreenMain.pas b/src/screens/UScreenMain.pas
index 7237eb80..ca4ba7cc 100644
--- a/src/screens/UScreenMain.pas
+++ b/src/screens/UScreenMain.pas
@@ -136,8 +136,13 @@ begin
             if (Ini.Players = 4) then
               PlayersPlay := 6;
 
-            ScreenName.Goto_SingScreen := false;
-            FadeTo(@ScreenName, SoundLib.Start);
+            if Ini.OnSongClick = sSelectPlayer then
+              FadeTo(@ScreenLevel)
+            else
+            begin
+              ScreenName.Goto_SingScreen := false;
+              FadeTo(@ScreenName, SoundLib.Start);
+            end;
           end
           else //show error message
             ScreenPopupError.ShowPopup(Language.Translate('ERROR_NO_SONGS'));
-- 
cgit v1.2.3