Partially fix thread safety issues around _cur_palette

Replaces: 4c59dfb6
See also: https://github.com/OpenTTD/OpenTTD/issues/8712
This commit is contained in:
Jonathan G Rennison
2021-04-05 20:25:45 +01:00
parent b496a0c442
commit e094b7f1d6
3 changed files with 18 additions and 2 deletions

View File

@@ -82,6 +82,11 @@
#include "linkgraph/linkgraphschedule.h"
#include "tracerestrict.h"
#include <mutex>
#if defined(__MINGW32__)
#include "../3rdparty/mingw-std-threads/mingw.mutex.h"
#endif
#include <stdarg.h>
#include <system_error>
@@ -1971,7 +1976,11 @@ void GameLoop()
StateGameLoop();
}
if (!_pause_mode && HasBit(_display_opt, DO_FULL_ANIMATION)) DoPaletteAnimations();
if (!_pause_mode && HasBit(_display_opt, DO_FULL_ANIMATION)) {
extern std::mutex _cur_palette_mutex;
std::lock_guard<std::mutex> lock_state(_cur_palette_mutex);
DoPaletteAnimations();
}
SoundDriver::GetInstance()->MainLoop();
MusicLoop();