From 8d30e9dfaad9eda54d66c8245f84329d84eb3256 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Fri, 7 Apr 2023 12:15:11 +0200 Subject: [PATCH 1/2] Make audio source release status atomic As audio sources get released from a callback done in a thread separate from main, the released status needs to be atomic. --- src/openrct2-ui/audio/SDLAudioSource.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/openrct2-ui/audio/SDLAudioSource.h b/src/openrct2-ui/audio/SDLAudioSource.h index e29b7333fe..7b3fc392d4 100644 --- a/src/openrct2-ui/audio/SDLAudioSource.h +++ b/src/openrct2-ui/audio/SDLAudioSource.h @@ -11,6 +11,7 @@ #include "AudioFormat.h" +#include #include #include #include @@ -28,7 +29,7 @@ namespace OpenRCT2::Audio class SDLAudioSource : public IAudioSource { private: - bool _released{}; + std::atomic _released{}; public: void Release() override; From db1b7f2a0feb040449e03b2fae268738f97d9cec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Fri, 7 Apr 2023 13:09:40 +0200 Subject: [PATCH 2/2] Update src/openrct2-ui/audio/SDLAudioSource.h --- src/openrct2-ui/audio/SDLAudioSource.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openrct2-ui/audio/SDLAudioSource.h b/src/openrct2-ui/audio/SDLAudioSource.h index 7b3fc392d4..3646fe8c6e 100644 --- a/src/openrct2-ui/audio/SDLAudioSource.h +++ b/src/openrct2-ui/audio/SDLAudioSource.h @@ -11,8 +11,8 @@ #include "AudioFormat.h" -#include #include +#include #include #include #include