aboutsummaryrefslogtreecommitdiffstats
path: root/Game/Code/Screens/UScreenSong.pas
diff options
context:
space:
mode:
authorbrunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-06-25 18:17:57 +0000
committerbrunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-06-25 18:17:57 +0000
commit73667c7058d5d9b6d006ebfc8ebfea6435e6abf9 (patch)
treeaf845c7099b66411f869b5f7046d4ba880d03d8f /Game/Code/Screens/UScreenSong.pas
parent4c34cb5e200a4cdcdfaba52789e7d9a23a84dab6 (diff)
downloadusdx-73667c7058d5d9b6d006ebfc8ebfea6435e6abf9.tar.gz
usdx-73667c7058d5d9b6d006ebfc8ebfea6435e6abf9.tar.xz
usdx-73667c7058d5d9b6d006ebfc8ebfea6435e6abf9.zip
- do not shuffle, if music no music loaded
- scan more data on mp3 files (BASS_CONFIG_VERIFY) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2560 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'Game/Code/Screens/UScreenSong.pas')
-rw-r--r--Game/Code/Screens/UScreenSong.pas2
1 files changed, 1 insertions, 1 deletions
diff --git a/Game/Code/Screens/UScreenSong.pas b/Game/Code/Screens/UScreenSong.pas
index bed5ae0a..596eec57 100644
--- a/Game/Code/Screens/UScreenSong.pas
+++ b/Game/Code/Screens/UScreenSong.pas
@@ -2638,7 +2638,7 @@ begin
not MakeMedley and not CatSongs.Song[Interaction].Main and
(Length(CatSongs.Song)-CatSongs.CatCount>1) then
begin
- if (WaitHandler.changed and
+ if (WaitHandler.changed and Music.isOpen and
(((Ini.ShuffleTime<9) and (WaitHandler.change_time + TimeSkip>Ini.ShuffleTime*15))
or (Music.Finished))) then
begin