[Scummvm-cvs-logs] CVS: residual smush.cpp,1.40,1.41

Pawel Kolodziejski aquadran at users.sourceforge.net
Wed Apr 28 11:17:02 CEST 2004


Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9125

Modified Files:
	smush.cpp 
Log Message:
moved free buffers into proper place

Index: smush.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/smush.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- smush.cpp	26 Apr 2004 10:03:59 -0000	1.40
+++ smush.cpp	28 Apr 2004 18:16:06 -0000	1.41
@@ -26,7 +26,11 @@
 #include "resource.h"
 #include "engine.h"
 
+#ifdef DIRECT3D_DRIVER
+#include "driver_d3d.h"
+#else
 #include "driver_gl.h"
+#endif
 
 Smush *g_smush;
 extern SoundMixer *g_mixer;
@@ -55,15 +59,6 @@
 
 Smush::~Smush() {
 	deinit();
-	if (_internalBuffer) {
-		free(_internalBuffer);
-		_internalBuffer = NULL;
-	}
-	if (_externalBuffer) {
-		free(_externalBuffer);
-		_externalBuffer = NULL;
-	}
-
 	delete_mutex(_mutex);
 }
 
@@ -90,6 +85,15 @@
 	StackLock lock(_mutex);
     g_timer->removeTimerProc(&timerCallback);
 
+	if (_internalBuffer) {
+		free(_internalBuffer);
+		_internalBuffer = NULL;
+	}
+	if (_externalBuffer) {
+		free(_externalBuffer);
+		_externalBuffer = NULL;
+	}
+
 	_videoFinished = true;
 	_videoPause = true;
 	if (_stream) {





More information about the Scummvm-git-logs mailing list