[Scummvm-cvs-logs] SF.net SVN: scummvm:[54574] scummvm/trunk/backends

[fingolfin at users.sourceforge.net]

Revision: 54574
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54574&view=rev
Author:   fingolfin
Date:     2010-11-29 16:22:04 +0000 (Mon, 29 Nov 2010)

Log Message:
-----------
SDL: Revert r54554, and add explanatory comment (fix for bug #3121841)

Modified Paths:
--------------
    scummvm/trunk/backends/modular-backend.cpp
    scummvm/trunk/backends/platform/sdl/sdl.cpp

Modified: scummvm/trunk/backends/modular-backend.cpp
===================================================================
--- scummvm/trunk/backends/modular-backend.cpp	2010-11-29 16:18:43 UTC (rev 54573)
+++ scummvm/trunk/backends/modular-backend.cpp	2010-11-29 16:22:04 UTC (rev 54574)
@@ -40,8 +40,8 @@
 }
 
 ModularBackend::~ModularBackend() {
+	delete _graphicsManager;
 	delete _eventManager;
-	delete _graphicsManager;
 	delete _mixer;
 	delete _audiocdManager;
 	delete _savefileManager;

Modified: scummvm/trunk/backends/platform/sdl/sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/sdl/sdl.cpp	2010-11-29 16:18:43 UTC (rev 54573)
+++ scummvm/trunk/backends/platform/sdl/sdl.cpp	2010-11-29 16:22:04 UTC (rev 54574)
@@ -81,10 +81,26 @@
 OSystem_SDL::~OSystem_SDL() {
 	SDL_ShowCursor(SDL_ENABLE);
 
+	// Delete the various managers here. Note that the ModularBackend
+	// destructor would also take care of this for us. However, various
+	// of our managers must be deleted *before* we call SDL_Quit().
+	// Hence, we perform the destruction on our own.
+	delete _savefileManager;
+	_savefileManager = 0;
+	delete _graphicsManager;
+	_graphicsManager = 0;
+	delete _eventManager;
+	_eventManager = 0;
 	delete _eventSource;
 	_eventSource = 0;
+	delete _audiocdManager;
+	_audiocdManager = 0;
 	delete _mixerManager;
 	_mixerManager = 0;
+	delete _timerManager;
+	_timerManager = 0;
+	delete _mutexManager;
+	_mutexManager = 0;
 
 #ifdef USE_OPENGL
 	delete[] _graphicsModes;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.