aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authork-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2009-12-17 20:24:18 +0000
committerk-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2009-12-17 20:24:18 +0000
commit29d0e397e5201df416ff5fa2cc8101276697fffb (patch)
tree07e7af3a4d72dda8a10130456bfedde4f8276473 /src
parent8867867466b276886c963e05f304f55b29e98794 (diff)
downloadusdx-29d0e397e5201df416ff5fa2cc8101276697fffb.tar.gz
usdx-29d0e397e5201df416ff5fa2cc8101276697fffb.tar.xz
usdx-29d0e397e5201df416ff5fa2cc8101276697fffb.zip
Just a test. Probably ignore this!
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2045 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'src')
-rw-r--r--src/screens/UScreenSong.pas5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/screens/UScreenSong.pas b/src/screens/UScreenSong.pas
index a2760ae3..305088e5 100644
--- a/src/screens/UScreenSong.pas
+++ b/src/screens/UScreenSong.pas
@@ -1548,11 +1548,12 @@ end;
procedure TScreenSong.OnHide;
begin
// 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));
+// if (PreviewOpened <> Interaction) then
// turn music volume to 100%
AudioPlayback.SetVolume(1.0);
+ if (IPreviewVolumeVals[Ini.PreviewVolume] = 0) then
+ AudioPlayback.Open(CatSongs.Song[Interaction].Path.Append(CatSongs.Song[Interaction].Mp3));
// if hide then stop music (for party mode popup on exit)
if (Display.NextScreen <> @ScreenSing) and