From 184a1662f1498203cec9551b0407a8908f6e5e49 Mon Sep 17 00:00:00 2001 From: brunzelchen Date: Sun, 21 Feb 2010 14:24:37 +0000 Subject: fixed choosing songs in "plugin" medley surprise fixed deactivation of karaoke mode on MP3 loading git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2134 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/Screens/UScreenSong.pas | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'Game/Code/Screens/UScreenSong.pas') diff --git a/Game/Code/Screens/UScreenSong.pas b/Game/Code/Screens/UScreenSong.pas index bd4c7c87..001ff860 100644 --- a/Game/Code/Screens/UScreenSong.pas +++ b/Game/Code/Screens/UScreenSong.pas @@ -3131,11 +3131,14 @@ begin begin for I := 0 to Length(CatSongs.Song) - 1 do begin - if CatSongs.Song[I].Visible and (CatSongs.Song[I].Medley.Source >= MinS) and not PartyPlayedMedley(I) + if (CatSongs.Song[I].Medley.Source >= MinS) and not PartyPlayedMedley(I) and not SongSkipped(I) then begin - SetLength(res, Length(res)+1); - res[Length(res)-1] := I; + if (PlaylistMan.Mode<>0) or ((PlaylistMan.Mode=0) and CatSongs.Song[I].Visible) then + begin + SetLength(res, Length(res)+1); + res[Length(res)-1] := I; + end; end; end; end else -- cgit v1.2.3