mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix #7007: deadlock when launched with -n switch

pull/7105/head
glx 2019-01-25 21:22:49 +01:00 committed by Charles Pigott
parent 9fa827ed78
commit e76fd99c47
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gfx.cpp
View File

@ -1317,7 +1317,11 @@ void DrawDirtyBlocks()
/* Wait a while and update _realtime_tick so we are given the rights */ /* Wait a while and update _realtime_tick so we are given the rights */
if (!IsFirstModalProgressLoop()) CSleep(MODAL_PROGRESS_REDRAW_TIMEOUT); if (!IsFirstModalProgressLoop()) CSleep(MODAL_PROGRESS_REDRAW_TIMEOUT);
_realtime_tick += MODAL_PROGRESS_REDRAW_TIMEOUT; _realtime_tick += MODAL_PROGRESS_REDRAW_TIMEOUT;
/* Modal progress thread may need blitter access while we are waiting for it. */
VideoDriver::GetInstance()->ReleaseBlitterLock();
_modal_progress_paint_mutex->BeginCritical(); _modal_progress_paint_mutex->BeginCritical();
VideoDriver::GetInstance()->AcquireBlitterLock();
_modal_progress_work_mutex->BeginCritical(); _modal_progress_work_mutex->BeginCritical();
/* When we ended with the modal progress, do not draw the blocks. /* When we ended with the modal progress, do not draw the blocks.