[Scummvm-cvs-logs] SF.net SVN: scummvm:[33095] scummvm/trunk/backends/platform/sdl/sdl.cpp
dreammaster at users.sourceforge.net
dreammaster at users.sourceforge.net
Fri Jul 18 11:36:52 CEST 2008
Revision: 33095
http://scummvm.svn.sourceforge.net/scummvm/?rev=33095&view=rev
Author: dreammaster
Date: 2008-07-18 09:36:49 +0000 (Fri, 18 Jul 2008)
Log Message:
-----------
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
Modified Paths:
--------------
scummvm/trunk/backends/platform/sdl/sdl.cpp
Modified: scummvm/trunk/backends/platform/sdl/sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/sdl/sdl.cpp 2008-07-18 04:16:00 UTC (rev 33094)
+++ scummvm/trunk/backends/platform/sdl/sdl.cpp 2008-07-18 09:36:49 UTC (rev 33095)
@@ -550,11 +550,12 @@
void OSystem_SDL::closeMixer() {
if (_mixer)
_mixer->setReady(false);
+
+ SDL_CloseAudio();
+
delete _mixer;
_mixer = 0;
- SDL_CloseAudio();
-
#ifdef MIXER_DOUBLE_BUFFERING
deinitThreadedMixer();
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list