[Scummvm-cvs-logs] CVS: scummvm/backends/sdl sdl-common.cpp,1.67,1.68 sdl.cpp,1.40,1.41 sdl_gl.cpp,1.47,1.48

[Max Horn]

Update of /cvsroot/scummvm/scummvm/backends/sdl
In directory sc8-pr-cvs1:/tmp/cvs-serv23395/backends/sdl

Modified Files:
	sdl-common.cpp sdl.cpp sdl_gl.cpp 
Log Message:
fixed stack lock at startup

Index: sdl-common.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl-common.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- sdl-common.cpp	5 Jul 2003 15:17:46 -0000	1.67
+++ sdl-common.cpp	5 Jul 2003 15:28:27 -0000	1.68
@@ -148,7 +148,7 @@
 	if (_screen == NULL)
 		return;
 
-	StackLock lock(_graphicsMutex);	// Lock the mutex until this function ends
+	StackLock lock(_graphicsMutex, this);	// Lock the mutex until this function ends
 	
 	if (((uint32)buf & 3) == 0 && pitch == _screenWidth && x==0 && y==0 &&
 			w==_screenWidth && h==_screenHeight && _mode_flags&DF_WANT_RECT_OPTIM) {
@@ -1229,7 +1229,7 @@
 	if (!_overlayVisible)
 		return;
 	
-	StackLock lock(_graphicsMutex);	// Lock the mutex until this function ends
+	StackLock lock(_graphicsMutex, this);	// Lock the mutex until this function ends
 	
 	// hide the mouse
 	undraw_mouse();

Index: sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- sdl.cpp	3 Jul 2003 19:12:24 -0000	1.40
+++ sdl.cpp	5 Jul 2003 15:28:27 -0000	1.41
@@ -210,7 +210,7 @@
 void OSystem_SDL::update_screen() {
 	assert(_hwscreen != NULL);
 
-	StackLock lock(_graphicsMutex);	// Lock the mutex until this function ends
+	StackLock lock(_graphicsMutex, this);	// Lock the mutex until this function ends
 
 	// If the shake position changed, fill the dirty area with blackness
 	if (_currentShakePos != _newShakePos) {
@@ -336,7 +336,7 @@
 
 uint32 OSystem_SDL::property(int param, Property *value) {
 
-	StackLock lock(_graphicsMutex);	// Lock the mutex until this function ends
+	StackLock lock(_graphicsMutex, this);	// Lock the mutex until this function ends
 
 	if (param == PROP_TOGGLE_FULLSCREEN) {
 		assert(_hwscreen != 0);

Index: sdl_gl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl_gl.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- sdl_gl.cpp	5 Jul 2003 13:41:14 -0000	1.47
+++ sdl_gl.cpp	5 Jul 2003 15:28:27 -0000	1.48
@@ -348,7 +348,7 @@
 
 void OSystem_SDL_OpenGL::update_screen() {
 
-	StackLock lock(_graphicsMutex);	// Lock the mutex until this function ends
+	StackLock lock(_graphicsMutex, this);	// Lock the mutex until this function ends
 
 	// If the shake position changed, fill the dirty area with blackness
 	if (_currentShakePos != _newShakePos) {
@@ -548,7 +548,7 @@
 
 uint32 OSystem_SDL_OpenGL::property(int param, Property *value) {
 
-	StackLock lock(_graphicsMutex); // Lock the mutex until this function ends
+	StackLock lock(_graphicsMutex, this); // Lock the mutex until this function ends
 
 	if (param == PROP_TOGGLE_FULLSCREEN) {
 		if (!_usingOpenGL)