aboutsummaryrefslogtreecommitdiff
path: root/sky
diff options
context:
space:
mode:
authorRobert Göffringmann2003-06-17 12:26:25 +0000
committerRobert Göffringmann2003-06-17 12:26:25 +0000
commit61491fb295647462611f49752942834b3afb0273 (patch)
tree790941d015dfb45244ee914fb42400b7e5bd2ca5 /sky
parent3764908eb320b0a73c7577abcc6e66c1d4daaf0f (diff)
downloadscummvm-rg350-61491fb295647462611f49752942834b3afb0273.tar.gz
scummvm-rg350-61491fb295647462611f49752942834b3afb0273.tar.bz2
scummvm-rg350-61491fb295647462611f49752942834b3afb0273.zip
don't restart music if the same track is already playing
svn-id: r8528
Diffstat (limited to 'sky')
-rw-r--r--sky/music/musicbase.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/sky/music/musicbase.cpp b/sky/music/musicbase.cpp
index cc1670f996..d03edbb4f2 100644
--- a/sky/music/musicbase.cpp
+++ b/sky/music/musicbase.cpp
@@ -148,7 +148,8 @@ void SkyMusicBase::pollMusic(void)
uint8 newTempo;
if (_onNextPoll.doReInit) startDriver();
if (_onNextPoll.doStopMusic) stopMusic();
- if (_onNextPoll.musicToProcess) loadNewMusic();
+ if (_onNextPoll.musicToProcess == _currentMusic) _onNextPoll.musicToProcess = 0;
+ if (_onNextPoll.musicToProcess) loadNewMusic();
_aktTime += _tempo;