From 299159b1e04359a3b45e822d2bf88838dc45a125 Mon Sep 17 00:00:00 2001
From: kalaposfos13 <153381648+kalaposfos13@users.noreply.github.com>
Date: Tue, 6 Jan 2026 19:49:52 +0100
Subject: [PATCH] logging: fix thread name logging for async logs (#3898)

* logging: fix thread name logging for async logs

* copyright 2026
---
 src/common/logging/backend.cpp        | 2 ++
 src/common/logging/log_entry.h        | 1 +
 src/common/logging/text_formatter.cpp | 6 ++----
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp
index 4a85c4cde..a65d1d09b 100644
--- a/src/common/logging/backend.cpp
+++ b/src/common/logging/backend.cpp
@@ -1,4 +1,5 @@
 // SPDX-FileCopyrightText: Copyright 2014 Citra Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <chrono>
@@ -219,6 +220,7 @@ public:
             .line_num = line_num,
             .function = function,
             .message = std::move(message),
+            .thread = Common::GetCurrentThreadName(),
         };
         if (Config::getLogType() == "async") {
             message_queue.EmplaceWait(entry);
diff --git a/src/common/logging/log_entry.h b/src/common/logging/log_entry.h
index cd4ae9355..6c529f878 100644
--- a/src/common/logging/log_entry.h
+++ b/src/common/logging/log_entry.h
@@ -21,6 +21,7 @@ struct Entry {
     u32 line_num = 0;
     std::string function;
     std::string message;
+    std::string thread;
 };
 
 } // namespace Common::Log
diff --git a/src/common/logging/text_formatter.cpp b/src/common/logging/text_formatter.cpp
index e7a786396..e8c5f4979 100644
--- a/src/common/logging/text_formatter.cpp
+++ b/src/common/logging/text_formatter.cpp
@@ -14,7 +14,6 @@
 #include "common/logging/log.h"
 #include "common/logging/log_entry.h"
 #include "common/logging/text_formatter.h"
-#include "common/thread.h"
 
 namespace Common::Log {
 
@@ -25,9 +24,8 @@ std::string FormatLogMessage(const Entry& entry) {
     const char* class_name = GetLogClassName(entry.log_class);
     const char* level_name = GetLevelName(entry.log_level);
 
-    return fmt::format("[{}] <{}> ({}) {}:{} {}: {}", class_name, level_name,
-                       Common::GetCurrentThreadName(), entry.filename, entry.line_num,
-                       entry.function, entry.message);
+    return fmt::format("[{}] <{}> ({}) {}:{} {}: {}", class_name, level_name, entry.thread,
+                       entry.filename, entry.line_num, entry.function, entry.message);
 }
 
 void PrintMessage(const Entry& entry) {