diff options
| author | whiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2007-05-16 20:59:37 +0000 |
|---|---|---|
| committer | whiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2007-05-16 20:59:37 +0000 |
| commit | 955e54f098cf8c282fdf72f3bca5f87c1db79df6 (patch) | |
| tree | 60ea9985548f395e9581951bf03016c157da3baf /Game/Code/Screens | |
| parent | daec13789113637bd806cc2a00d8c97d5b38c7ef (diff) | |
| download | usdx-955e54f098cf8c282fdf72f3bca5f87c1db79df6.tar.gz usdx-955e54f098cf8c282fdf72f3bca5f87c1db79df6.tar.xz usdx-955e54f098cf8c282fdf72f3bca5f87c1db79df6.zip | |
Fixed a Bug in SongScreen that causes Playlist and Search is unclosable when Tabs=Off
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@201 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'Game/Code/Screens')
| -rw-r--r-- | Game/Code/Screens/UScreenSong.pas | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/Game/Code/Screens/UScreenSong.pas b/Game/Code/Screens/UScreenSong.pas index 33a6752d..48c6597a 100644 --- a/Game/Code/Screens/UScreenSong.pas +++ b/Game/Code/Screens/UScreenSong.pas @@ -292,14 +292,31 @@ begin end
else
begin
- //On Escape goto Cat-List Hack End
- Music.Stop;
- Music.PlayBack;
-// FadeTo(@ScreenLevel);
- FadeTo(@ScreenMain);
+ //On Escape goto Cat-List Hack End
+ //Tabs off and in Search or Playlist -> Go back to Song view
+ if (CatSongs.CatNumShow < -1) then
+ begin
+ //Atm: Set Empty Filter
+ CatSongs.SetFilter('', 0);
+
+ //Show Cat in Top Left Mod
+ HideCatTL;
+ Interaction := 0;
+
+ //Show Wrong Song when Tabs on Fix
+ SelectNext;
+ FixSelected;
+
+ ChangeMusic;
+ end
+ else
+ begin
+ Music.Stop;
+ Music.PlayBack;
+
+ FadeTo(@ScreenMain);
+ end;
-// Music.Open(Skin.SkinPath + 'Menu Music 3.mp3');
-// Music.Play;
end;
end
//When in party Mode then Ask before Close
|