summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Merry2022-03-10 10:49:15 +0000
committerGravatar Merry2022-03-10 10:49:15 +0000
commit22f50c6bc1e5b62e3e334f04b49c0b00cb2fea9c (patch)
tree5c2ba970cab18804aba18129be23a15b003f4568
parentMerge pull request #7998 from Wunkolo/cpuid_array (diff)
downloadyuzu-22f50c6bc1e5b62e3e334f04b49c0b00cb2fea9c.tar.gz
yuzu-22f50c6bc1e5b62e3e334f04b49c0b00cb2fea9c.tar.xz
yuzu-22f50c6bc1e5b62e3e334f04b49c0b00cb2fea9c.zip
backend: Ensure backend_thread is destructed before message_queue
Ensures that stop_token signals that stop has been requested before destruction of conditional_variable
-rw-r--r--src/common/logging/backend.cpp2
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