From dfa0f5a144b8bf018b29d801f7d8a7c54ae6d108 Mon Sep 17 00:00:00 2001
From: whiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 2 May 2007 17:44:23 +0000
Subject: 2 Bugs Fixed:   Select Last Song instead First Song when showing Song
 Screen for the first Time   Go to MainScreen instead of Song Screen when
 pressing Esc in the Name Screen after Selecting Select Players from Menu

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@154 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Game/Code/Screens/UScreenName.pas | 5 ++++-
 Game/Code/Screens/UScreenSong.pas | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'Game/Code/Screens')

diff --git a/Game/Code/Screens/UScreenName.pas b/Game/Code/Screens/UScreenName.pas
index 9819b994..9db7947c 100644
--- a/Game/Code/Screens/UScreenName.pas
+++ b/Game/Code/Screens/UScreenName.pas
@@ -41,7 +41,10 @@ begin
         begin
           Ini.SaveNames;
           Music.PlayBack;
-          FadeTo(@ScreenMain);
+          if GoTo_SingScreen then
+            FadeTo(@ScreenSong)
+          else
+            FadeTo(@ScreenMain);
         end;
 
       SDLK_RETURN:
diff --git a/Game/Code/Screens/UScreenSong.pas b/Game/Code/Screens/UScreenSong.pas
index 5c383168..1f3c7c8f 100644
--- a/Game/Code/Screens/UScreenSong.pas
+++ b/Game/Code/Screens/UScreenSong.pas
@@ -1169,7 +1169,7 @@ begin
     if (Ini.Tabs_at_startup = 1) AND (CatSongs.CatNumShow = -1) then
       begin
       CatSongs.ShowCategoryList;
-      SelectNext;SelectPrev; //Workaround <- must be fixed sometime
+      SelectNext; //Workaround <- must be fixed sometime
       FixSelected;
       //Show Cat in Top Left Mod
         HideCatTL;
-- 
cgit v1.2.3