diff options
| author | whiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2009-12-29 15:09:32 +0000 |
|---|---|---|
| committer | whiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2009-12-29 15:09:32 +0000 |
| commit | 66cae6a143822a4b3f596717d2671db910026054 (patch) | |
| tree | 27ab9140c03a3271ae13a3b4b4bec14ee159174a /Lua/src/screens | |
| parent | f703eb192dce8d90ce09e6d92892fd788b4af3b7 (diff) | |
| download | usdx-66cae6a143822a4b3f596717d2671db910026054.tar.gz usdx-66cae6a143822a4b3f596717d2671db910026054.tar.xz usdx-66cae6a143822a4b3f596717d2671db910026054.zip | |
merged r2056 into lua branch
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2057 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'Lua/src/screens')
| -rw-r--r-- | Lua/src/screens/UScreenEditSub.pas | 2 | ||||
| -rw-r--r-- | Lua/src/screens/UScreenSong.pas | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Lua/src/screens/UScreenEditSub.pas b/Lua/src/screens/UScreenEditSub.pas index 609a689b..10584ce8 100644 --- a/Lua/src/screens/UScreenEditSub.pas +++ b/Lua/src/screens/UScreenEditSub.pas @@ -934,7 +934,7 @@ begin begin Inc(HighNote); SetLength(Note, HighNote + 1); - Note[HighNote] := Note[N]; + Note[HighNote] := Lines[0].Line[CStart].Note[N]; End_ := Note[HighNote].Start + Note[HighNote].Length; if Note[HighNote].Tone < BaseNote then diff --git a/Lua/src/screens/UScreenSong.pas b/Lua/src/screens/UScreenSong.pas index 716f4053..5bc42a68 100644 --- a/Lua/src/screens/UScreenSong.pas +++ b/Lua/src/screens/UScreenSong.pas @@ -1529,8 +1529,8 @@ end; procedure TScreenSong.OnHide; begin - // if preview is not loaded: load musicfile now - if (PreviewOpened <> Interaction) then + // if preview is not loaded: load musicfile now; not on cat-main! + if (PreviewOpened <> Interaction) and not CatSongs.Song[Interaction].main then AudioPlayback.Open(CatSongs.Song[Interaction].Path.Append(CatSongs.Song[Interaction].Mp3)); // turn music volume to 100% |