1 files changed, 8 insertions, 1 deletions
diff --git a/src/common/threadsafe_queue.h b/src/common/threadsafe_queue.h
index 2ef1da0644..f9fc0ca171 100644
--- a/src/common/threadsafe_queue.h
+++ b/src/common/threadsafe_queue.h
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: 2010 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -99,7 +102,11 @@ public:
     T PopWait(std::stop_token stop_token) {
         if (Empty()) {
             std::unique_lock lock{cv_mutex};
-            Common::CondvarWait(cv, lock, stop_token, [this] { return !Empty(); });
+            if constexpr (with_stop_token) {
+                cv.wait(lock, stop_token, [this] { return !Empty(); });
+            } else {
+                cv.wait(lock, [this] { return !Empty(); });
+            }
         }
         if (stop_token.stop_requested()) {
             return T{};