aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authork-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2009-12-17 20:51:31 +0000
committerk-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2009-12-17 20:51:31 +0000
commit988ccd68a2b6b89dd1a9e622ea15be2bcc2d6270 (patch)
tree4517845ee1ac01c666790df3cebdd45ed88549b0 /src
parent29d0e397e5201df416ff5fa2cc8101276697fffb (diff)
downloadusdx-988ccd68a2b6b89dd1a9e622ea15be2bcc2d6270.tar.gz
usdx-988ccd68a2b6b89dd1a9e622ea15be2bcc2d6270.tar.xz
usdx-988ccd68a2b6b89dd1a9e622ea15be2bcc2d6270.zip
revert previous commit. It did not solve the problem of non song on fedora.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2046 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'src')
-rw-r--r--src/screens/UScreenSong.pas5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/screens/UScreenSong.pas b/src/screens/UScreenSong.pas
index 305088e5..a2760ae3 100644
--- a/src/screens/UScreenSong.pas
+++ b/src/screens/UScreenSong.pas
@@ -1548,12 +1548,11 @@ end;
procedure TScreenSong.OnHide;
begin
// if preview is not loaded: load musicfile now; not on cat-main!
-// if (PreviewOpened <> Interaction) then
+ 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%
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