diff options
author | whiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2007-05-16 19:19:35 +0000 |
---|---|---|
committer | whiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2007-05-16 19:19:35 +0000 |
commit | 4a731514163a14bd3a9222d99707880b56772663 (patch) | |
tree | f9193c9c0cdc6ebf2602db8970e1e46cd7c394c1 /Game/Code/Screens/UScreenSong.pas | |
parent | 9b29c5321e423fbe6ba29f32bdcf8f2c83828e92 (diff) | |
download | usdx-4a731514163a14bd3a9222d99707880b56772663.tar.gz usdx-4a731514163a14bd3a9222d99707880b56772663.tar.xz usdx-4a731514163a14bd3a9222d99707880b56772663.zip |
all SongFile Loading and Saving procedures moved to UFiles.
Added Some Tolerance in Song File Loading and Song Header Loading.
Fix: Programm doesn't Crash anymore when a coruppted Song is loaded for Singing or Editing. Now Jump back to SongScreen and show an Error Message. Also Party Mode is not Interupted, a new Song will be selected automatically.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@197 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'Game/Code/Screens/UScreenSong.pas')
-rw-r--r-- | Game/Code/Screens/UScreenSong.pas | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Game/Code/Screens/UScreenSong.pas b/Game/Code/Screens/UScreenSong.pas index 2ce6b6df..33a6752d 100644 --- a/Game/Code/Screens/UScreenSong.pas +++ b/Game/Code/Screens/UScreenSong.pas @@ -3,7 +3,7 @@ unit UScreenSong; interface
uses
- UMenu, SDL, UMusic, UPliki, UTime, UDisplay, USongs, SysUtils, ULog, UThemes, UTexture, ULanguage,
+ UMenu, SDL, UMusic, UFiles, UTime, UDisplay, USongs, SysUtils, ULog, UThemes, UTexture, ULanguage,
ULCD, ULight, UIni;
type
@@ -1227,7 +1227,7 @@ end; procedure TScreenSong.onHide;
begin
//When hide then Stop Music (For Party Mode Popup on Exit)
- if (Display.NextScreen <> @ScreenSing) and (Display.NextScreen <> @ScreenSingModi) then
+ if (Display.NextScreen <> @ScreenSing) and (Display.NextScreen <> @ScreenSingModi) and (Music <> nil) then
Music.Stop;
end;
|