dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r18796) -Fix [FS#3521]: [SDL] possible deadlock when killing OpenTTD while starting it

Browse Source
This commit is contained in:
rubidium
2010-01-13 21:34:48 +00:00
parent f43646cd7d
commit 7aeccb9bd0
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/video/sdl_v.cpp
View File

@@ -112,8 +112,11 @@ static void DrawSurfaceToScreen()
static void DrawSurfaceToScreenThread(void *) static void DrawSurfaceToScreenThread(void *)
{ {
/* First wait till we 'may' start */ /* First tell the main thread we're started */
_draw_mutex->BeginCritical(); _draw_mutex->BeginCritical();
_draw_mutex->SendSignal();
/* Now wait for the first thing to draw! */
_draw_mutex->WaitForSignal(); _draw_mutex->WaitForSignal();
while (_draw_continue) { while (_draw_continue) {
@@ -516,6 +519,9 @@ void VideoDriver_SDL::MainLoop()
if (!_draw_threaded) { if (!_draw_threaded) {
_draw_mutex->EndCritical(); _draw_mutex->EndCritical();
delete _draw_mutex; delete _draw_mutex;
} else {
/* Wait till the draw mutex has started itself. */
_draw_mutex->WaitForSignal();
} }
} }
} }