diff options
| author | Torbjörn Andersson | 2006-06-17 15:54:40 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2006-06-17 15:54:40 +0000 |
| commit | ff38faa21d09a2a41323b196ddd586289dca292e (patch) | |
| tree | 32772f932901391f78e2d6f1d318037772902e73 /engines/sky/music/musicbase.h | |
| parent | ce1edcfd7d4bdd863e08f73797fbf773c9c8199c (diff) | |
| download | scummvm-rg350-ff38faa21d09a2a41323b196ddd586289dca292e.tar.gz scummvm-rg350-ff38faa21d09a2a41323b196ddd586289dca292e.tar.bz2 scummvm-rg350-ff38faa21d09a2a41323b196ddd586289dca292e.zip | |
The stopMusic() function (which is publicly accessable from the outside) now
locks the mutex to avoid pulling the proverbial rug out from beneath the timer
callback's proverbial feet. To stop the music when the mutex is already locked,
we use stopMusicInternal(), which is a protected function. This will hopefully
fix the crash on exit which has happened to me every few months.
svn-id: r23159
Diffstat (limited to 'engines/sky/music/musicbase.h')
| -rw-r--r-- | engines/sky/music/musicbase.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/engines/sky/music/musicbase.h b/engines/sky/music/musicbase.h index d9f3e22beb..108ee259c9 100644 --- a/engines/sky/music/musicbase.h +++ b/engines/sky/music/musicbase.h @@ -85,6 +85,8 @@ protected: void updateTempo(void); void loadNewMusic(void); void pollMusic(void); + + void stopMusicInternal(void); }; } // End of namespace Sky |