diff options
| author | 2023-11-14 12:23:11 -0500 | |
|---|---|---|
| committer | 2023-11-14 12:23:11 -0500 | |
| commit | 9a5ef835cc8cf3d9fb8fa791d03a43ae4472d614 (patch) | |
| tree | 79adeb345dc422ae213054bfc7bc0a91f1094c47 /src/core/core_timing.h | |
| parent | Merge pull request #12025 from liamwhite/kernel-shutdown-deadlock (diff) | |
| parent | core_timing: lock event queue access (diff) | |
| download | yuzu-9a5ef835cc8cf3d9fb8fa791d03a43ae4472d614.tar.gz yuzu-9a5ef835cc8cf3d9fb8fa791d03a43ae4472d614.tar.xz yuzu-9a5ef835cc8cf3d9fb8fa791d03a43ae4472d614.zip | |
Merge pull request #12028 from liamwhite/coretiming-shutdown
core_timing: lock event queue access
Diffstat (limited to 'src/core/core_timing.h')
| -rw-r--r-- | src/core/core_timing.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/core_timing.h b/src/core/core_timing.h index 26a8b93a7..21548f0a9 100644 --- a/src/core/core_timing.h +++ b/src/core/core_timing.h | |||
| @@ -161,7 +161,7 @@ private: | |||
| 161 | std::shared_ptr<EventType> ev_lost; | 161 | std::shared_ptr<EventType> ev_lost; |
| 162 | Common::Event event{}; | 162 | Common::Event event{}; |
| 163 | Common::Event pause_event{}; | 163 | Common::Event pause_event{}; |
| 164 | std::mutex basic_lock; | 164 | mutable std::mutex basic_lock; |
| 165 | std::mutex advance_lock; | 165 | std::mutex advance_lock; |
| 166 | std::unique_ptr<std::jthread> timer_thread; | 166 | std::unique_ptr<std::jthread> timer_thread; |
| 167 | std::atomic<bool> paused{}; | 167 | std::atomic<bool> paused{}; |