Fixed a Bug in UScreenSong. Everytime the Category List is shown, the next Song was selected. (Tabs=On)

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@224 b956fd51-792f-4845-bead-9b4dfca2ff2c

1 files changed, 10 insertions, 8 deletions

diff --git a/Game/Code/Screens/UScreenSong.pas b/Game/Code/Screens/UScreenSong.pas
index 82dad1ed..12929629 100644
--- a/Game/Code/Screens/UScreenSong.pas
+++ b/Game/Code/Screens/UScreenSong.pas
@@ -218,7 +218,7 @@ begin
     begin

       Letter := UpCase(Chr(ScanCode));

       I2 := Length(CatSongs.Song);

-      

+

       //Jump To Titel

       if (SDL_ModState = KMOD_LALT or KMOD_LSHIFT) then

       begin

@@ -252,7 +252,7 @@ begin
             ChangeMusic;

             SetScroll4;

             UpdateLCD;

-            

+

             //Break and Exit

             Exit;

           end;

@@ -664,7 +664,7 @@ var
 begin

   inherited Create;

 

-  LoadFromTheme(Theme.Song); 

+  LoadFromTheme(Theme.Song);

 

   TextArtist := AddText(Theme.Song.TextArtist);

   TextTitle :=  AddText(Theme.Song.TextTitle);

@@ -759,6 +759,9 @@ begin
   //ClearArray

   For I := low(EqualizerBands) to high(EqualizerBands) do

     EqualizerBands[I] := 3;

+

+  if (Length(CatSongs.Song) > 0) then

+    Interaction := 0;

 end;

 

 procedure TScreenSong.SetScroll;

@@ -1222,13 +1225,12 @@ begin
 

   //Cat Mod etc

     if (Ini.Tabs_at_startup = 1) AND (CatSongs.CatNumShow = -1) then

-      begin

+    begin

       CatSongs.ShowCategoryList;

-      SelectNext; //Workaround <- must be fixed sometime

       FixSelected;

       //Show Cat in Top Left Mod

-        HideCatTL;

-      end;

+      HideCatTL;

+    end;

 

 

   if Length(CatSongs.Song) > 0 then begin

@@ -1782,4 +1784,4 @@ FixSelected; }
 

 end;

 

-end.

+end.
\ No newline at end of file