diff options
| -rw-r--r-- | Game/Code/Screens/UScreenOptionsGame.pas | 3 | ||||
| -rw-r--r-- | Game/Code/Screens/UScreenOptionsThemes.pas | 4 | ||||
| -rw-r--r-- | Game/Code/Screens/UScreenSong.pas | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/Game/Code/Screens/UScreenOptionsGame.pas b/Game/Code/Screens/UScreenOptionsGame.pas index a77ce5b3..d4897905 100644 --- a/Game/Code/Screens/UScreenOptionsGame.pas +++ b/Game/Code/Screens/UScreenOptionsGame.pas @@ -20,7 +20,7 @@ const implementation
-uses UGraphic, UHelp, ULog;
+uses UGraphic, UHelp, ULog, UPlaylist;
function TScreenOptionsGame.ParseInput(PressedKey: Cardinal; ScanCode: byte; PressedDown: Boolean): Boolean;
begin
@@ -103,6 +103,7 @@ begin //Tabs at Startup fix
Ini.Tabs_at_startup := Ini.Tabs;
ScreenSong.Refresh(false);
+ PlaylistMan.LoadPlayLists;
end;
end;
diff --git a/Game/Code/Screens/UScreenOptionsThemes.pas b/Game/Code/Screens/UScreenOptionsThemes.pas index 9a65aae0..a6b5d543 100644 --- a/Game/Code/Screens/UScreenOptionsThemes.pas +++ b/Game/Code/Screens/UScreenOptionsThemes.pas @@ -25,7 +25,7 @@ const implementation
-uses UGraphic, USkins, UHelp, ULog;
+uses UGraphic, USkins, UHelp, ULog, UPlaylist;
function TScreenOptionsThemes.ParseInput(PressedKey: Cardinal; ScanCode: byte; PressedDown: Boolean): Boolean;
begin
@@ -53,6 +53,7 @@ begin UGraphic.UnLoadScreens();
UGraphic.LoadScreens( true );
ScreenSong.Refresh(true);
+ PlaylistMan.LoadPlayLists;
end;
Music.PlayBack;
FadeTo(@ScreenOptions);
@@ -69,6 +70,7 @@ begin UGraphic.UnLoadScreens();
UGraphic.LoadScreens( true );
ScreenSong.Refresh(true);
+ PlaylistMan.LoadPlayLists;
end;
Music.PlayBack;
FadeTo(@ScreenOptions);
diff --git a/Game/Code/Screens/UScreenSong.pas b/Game/Code/Screens/UScreenSong.pas index 0777e68d..0147923a 100644 --- a/Game/Code/Screens/UScreenSong.pas +++ b/Game/Code/Screens/UScreenSong.pas @@ -374,7 +374,7 @@ begin if (WaitHandler.active) and not (PressedKey IN [SDLK_RETURN, SDLK_TAB, SDLK_F,
SDLK_A, SDLK_E, SDLK_K, SDLK_M, SDLK_P, SDLK_S, SDLK_V]) then
begin
- if (Ini.Tabs_at_startup=1) then
+ if (Ini.Tabs_at_startup=1) and not (CatSongs.CatNumShow = -3) then
begin
//Search Cat
for I := WaitHandler.lastIndex downto low(CatSongs.Song) do
@@ -2343,7 +2343,7 @@ begin WaitHandler.lastCat := CatSongs.CatNumShow;
end;
- if(Ini.Tabs_at_startup<>1) then
+ if(Ini.Tabs_at_startup<>1) or (CatSongs.CatNumShow = -3) then
begin
//Random in one Category
SetLength(VisArr, 0);
|