diff options
| author | Max Horn | 2003-07-05 15:28:28 +0000 |
|---|---|---|
| committer | Max Horn | 2003-07-05 15:28:28 +0000 |
| commit | ce9d154957d8843a07a32730e7fd3400948e164d (patch) | |
| tree | 9d87bf17713d1e064e4d187ab93272e66c5ec91b /backends/sdl | |
| parent | 8a7d540687abdc9a4d431612318bbe43ea0424c8 (diff) | |
| download | scummvm-rg350-ce9d154957d8843a07a32730e7fd3400948e164d.tar.gz scummvm-rg350-ce9d154957d8843a07a32730e7fd3400948e164d.tar.bz2 scummvm-rg350-ce9d154957d8843a07a32730e7fd3400948e164d.zip | |
fixed stack lock at startup
svn-id: r8779
Diffstat (limited to 'backends/sdl')
| -rw-r--r-- | backends/sdl/sdl-common.cpp | 4 | ||||
| -rw-r--r-- | backends/sdl/sdl.cpp | 4 | ||||
| -rw-r--r-- | backends/sdl/sdl_gl.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/backends/sdl/sdl-common.cpp b/backends/sdl/sdl-common.cpp index 28e87db04b..3a261026c6 100644 --- a/backends/sdl/sdl-common.cpp +++ b/backends/sdl/sdl-common.cpp @@ -148,7 +148,7 @@ void OSystem_SDL_Common::copy_rect(const byte *buf, int pitch, int x, int y, int 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 @@ void OSystem_SDL_Common::clear_overlay() { 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(); diff --git a/backends/sdl/sdl.cpp b/backends/sdl/sdl.cpp index 0e2d2b42a1..8d73295be4 100644 --- a/backends/sdl/sdl.cpp +++ b/backends/sdl/sdl.cpp @@ -210,7 +210,7 @@ void OSystem_SDL::hotswap_gfx_mode() { 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 @@ void OSystem_SDL::update_screen() { 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); diff --git a/backends/sdl/sdl_gl.cpp b/backends/sdl/sdl_gl.cpp index b671601494..a7bea1c9f0 100644 --- a/backends/sdl/sdl_gl.cpp +++ b/backends/sdl/sdl_gl.cpp @@ -348,7 +348,7 @@ void OSystem_SDL_OpenGL::hotswap_gfx_mode() { 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 @@ bool OSystem_SDL_OpenGL::poll_event(Event *event) { 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) |