diff options
author | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2013-02-24 18:55:15 +0000 |
---|---|---|
committer | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2013-02-24 18:55:15 +0000 |
commit | 297d5ab8e59ca017addec5f0893c89c4704074ed (patch) | |
tree | 781fc8aafb980c351903087397fbcf921c1293f2 /src/base/USong.pas | |
parent | 2cc11db3642564bb8a71c22739175a6dd65eb4cb (diff) | |
download | usdx-297d5ab8e59ca017addec5f0893c89c4704074ed.tar.gz usdx-297d5ab8e59ca017addec5f0893c89c4704074ed.tar.xz usdx-297d5ab8e59ca017addec5f0893c89c4704074ed.zip |
fix problems with empty songlist. thanks to Zup3rvock.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2949 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
-rw-r--r-- | src/base/USong.pas | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/base/USong.pas b/src/base/USong.pas index 38ba1c12..4f35d774 100644 --- a/src/base/USong.pas +++ b/src/base/USong.pas @@ -1188,7 +1188,7 @@ begin if ((MedleyFlags and 1) = 0) or (self.PreviewStart <= 0) then //PreviewStart is not set or <=0 begin if (MedleyFlags and 2) = 2 then - self.PreviewStart := GetTimeFromBeat(self.Medley.StartBeat) //fallback to MedleyStart + self.PreviewStart := GetTimeFromBeat(self.Medley.StartBeat, self) //fallback to MedleyStart else self.PreviewStart := 0; //else set it to 0, it will be set in FindRefrainStart end; @@ -1552,7 +1552,10 @@ begin Resolution := 4; Creator := ''; PreviewStart := 0; - CalcMedley := true; + if CurrentSong = nil then + CalcMedley := false + else + CalcMedley := true; Medley.Source := msNone; Relative := false; |