diff options
| author | Paul Gilbert | 2008-07-18 09:36:49 +0000 |
|---|---|---|
| committer | Paul Gilbert | 2008-07-18 09:36:49 +0000 |
| commit | cb366384f7f6a7d45ace3d67f8df529fe8312584 (patch) | |
| tree | 5cc9c63089ac5befb4fc601d7e17079941dc53a0 /backends/platform | |
| parent | 702e26965c48e99490c25ca635e41c14ac88add2 (diff) | |
| download | scummvm-rg350-cb366384f7f6a7d45ace3d67f8df529fe8312584.tar.gz scummvm-rg350-cb366384f7f6a7d45ace3d67f8df529fe8312584.tar.bz2 scummvm-rg350-cb366384f7f6a7d45ace3d67f8df529fe8312584.zip | |
In OSystem_SDL::closeMixer moved the call to SDL_CloseAudio to before the deletion of the _mixer variable in to fix an assert that was being generated in OSystem_SDL::mixCallback
svn-id: r33095
Diffstat (limited to 'backends/platform')
| -rw-r--r-- | backends/platform/sdl/sdl.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp index cc5f2478e5..76ac91c282 100644 --- a/backends/platform/sdl/sdl.cpp +++ b/backends/platform/sdl/sdl.cpp @@ -550,11 +550,12 @@ void OSystem_SDL::setupMixer() { void OSystem_SDL::closeMixer() { if (_mixer) _mixer->setReady(false); - delete _mixer; - _mixer = 0; SDL_CloseAudio(); + delete _mixer; + _mixer = 0; + #ifdef MIXER_DOUBLE_BUFFERING deinitThreadedMixer(); #endif |