diff options
| author | 2022-03-10 08:07:41 -0500 | |
|---|---|---|
| committer | 2022-03-10 08:07:41 -0500 | |
| commit | e200161982dcbafc4bdd8da86a721c56384c6f40 (patch) | |
| tree | 5c2ba970cab18804aba18129be23a15b003f4568 /src/common/logging/backend.cpp | |
| parent | Merge pull request #7998 from Wunkolo/cpuid_array (diff) | |
| parent | backend: Ensure backend_thread is destructed before message_queue (diff) | |
| download | yuzu-e200161982dcbafc4bdd8da86a721c56384c6f40.tar.gz yuzu-e200161982dcbafc4bdd8da86a721c56384c6f40.tar.xz yuzu-e200161982dcbafc4bdd8da86a721c56384c6f40.zip | |
Merge pull request #7999 from merryhime/fix-7992
backend: Ensure backend_thread is destructed before message_queue
Diffstat (limited to '')
| -rw-r--r-- | src/common/logging/backend.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp index f1c9ed6c4..4a2462ec4 100644 --- a/src/common/logging/backend.cpp +++ b/src/common/logging/backend.cpp | |||
| @@ -276,9 +276,9 @@ private: | |||
| 276 | ColorConsoleBackend color_console_backend{}; | 276 | ColorConsoleBackend color_console_backend{}; |
| 277 | FileBackend file_backend; | 277 | FileBackend file_backend; |
| 278 | 278 | ||
| 279 | std::jthread backend_thread; | ||
| 280 | MPSCQueue<Entry, true> message_queue{}; | 279 | MPSCQueue<Entry, true> message_queue{}; |
| 281 | std::chrono::steady_clock::time_point time_origin{std::chrono::steady_clock::now()}; | 280 | std::chrono::steady_clock::time_point time_origin{std::chrono::steady_clock::now()}; |
| 281 | std::jthread backend_thread; | ||
| 282 | }; | 282 | }; |
| 283 | } // namespace | 283 | } // namespace |
| 284 | 284 | ||