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

Codechange: Acquire video buffer before taking game state lock to prevent erratic fast forward behaviour (#9140)

release/1.11
Milek7 2021-05-02 20:10:07 +02:00 committed by Charles Pigott
parent 72090f39ce
commit 8b5bd34a65
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/video/video_driver.cpp
View File

@ -131,13 +131,14 @@ void VideoDriver::Tick()
this->fast_forward_via_key = false; this->fast_forward_via_key = false;
} }
/* Locking video buffer can block (especially with vsync enabled), do it before taking game state lock. */
this->LockVideoBuffer();
{ {
/* Tell the game-thread to stop so we can have a go. */ /* Tell the game-thread to stop so we can have a go. */
std::lock_guard<std::mutex> lock_wait(this->game_thread_wait_mutex); std::lock_guard<std::mutex> lock_wait(this->game_thread_wait_mutex);
std::lock_guard<std::mutex> lock_state(this->game_state_mutex); std::lock_guard<std::mutex> lock_state(this->game_state_mutex);
this->LockVideoBuffer();
this->DrainCommandQueue(); this->DrainCommandQueue();
while (this->PollEvent()) {} while (this->PollEvent()) {}