From 955e54f098cf8c282fdf72f3bca5f87c1db79df6 Mon Sep 17 00:00:00 2001
From: whiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 16 May 2007 20:59:37 +0000
Subject: 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
---
 Game/Code/Screens/UScreenSong.pas | 31 ++++++++++++++++++++++++-------
 1 file 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
-- 
cgit v1.2.3