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

Avoid data race in calls to VideoDriver::GetGameInterval

Browse Source
This commit is contained in:
Jonathan G Rennison
2024-03-20 17:39:46 +00:00
parent 2c63a65b87
commit 84c476cea5
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/video/video_driver.cpp
View File

@@ -27,15 +27,17 @@ bool _video_vsync; ///< Whether we should use vsync (only if active video driver
void VideoDriver::GameLoop() void VideoDriver::GameLoop()
{ {
this->next_game_tick += this->GetGameInterval();
/* Avoid next_game_tick getting behind more and more if it cannot keep up. */
auto now = std::chrono::steady_clock::now(); auto now = std::chrono::steady_clock::now();
if (this->next_game_tick < now - ALLOWED_DRIFT * this->GetGameInterval()) this->next_game_tick = now;
{ {
std::lock_guard<std::recursive_mutex> lock(this->game_state_mutex); std::lock_guard<std::recursive_mutex> lock(this->game_state_mutex);
const auto interval = this->GetGameInterval();
this->next_game_tick += interval;
/* Avoid next_game_tick getting behind more and more if it cannot keep up. */
if (this->next_game_tick < now - ALLOWED_DRIFT * interval) this->next_game_tick = now;
::GameLoop(); ::GameLoop();
} }
} }