feat: show state of already installed driver

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/fetcher/ReleaseAdapter.kt

@@ -143,8 +143,21 @@ class ReleaseAdapter(
             binding.containerDownloads.removeAllViews()
 
             release.artifacts.forEach { artifact ->
+                val alreadyInstalled = try {
+                    // Prefer fast check via ViewModel list; fallback to helper if needed
+                    driverViewModel.driverData.any {
+                        File(it.first).name.equals(artifact.name, ignoreCase = true)
+                    } || GpuDriverHelper.isDriverZipInstalledByName(artifact.name)
+                } catch (_: Exception) {
+                    false
+                }
+
                 val button = MaterialButton(binding.root.context).apply {
-                    text = artifact.name
+                    text = if (alreadyInstalled) {
+                        context.getString(R.string.installed_label, artifact.name)
+                    } else {
+                        artifact.name
+                    }
                     setTextAppearance(
                         com.google.android.material.R.style.TextAppearance_Material3_LabelLarge
                     )
@@ -154,7 +167,7 @@ class ReleaseAdapter(
                             com.google.android.material.R.color.m3_button_background_color_selector
                         )
                     )
-                    setIconResource(R.drawable.ic_import)
+                    setIconResource(if (alreadyInstalled) R.drawable.ic_check else R.drawable.ic_import)
                     iconTint = ColorStateList.valueOf(
                         MaterialColors.getColor(
                             this,
@@ -167,7 +180,22 @@ class ReleaseAdapter(
                         ViewGroup.LayoutParams.MATCH_PARENT,
                         ViewGroup.LayoutParams.WRAP_CONTENT
                     )
+                    isEnabled = !alreadyInstalled
                     setOnClickListener {
+                        // Double-check just before starting (race-proof)
+                        if (GpuDriverHelper.isDriverZipInstalledByName(artifact.name)) {
+                            Toast.makeText(
+                                context,
+                                context.getString(R.string.driver_already_installed),
+                                Toast.LENGTH_SHORT
+                            ).show()
+                            // Update UI to reflect installed state
+                            this.isEnabled = false
+                            this.text = context.getString(R.string.installed_label, artifact.name)
+                            this.setIconResource(R.drawable.ic_check)
+                            return@setOnClickListener
+                        }
+
                         val dialogBinding =
                             DialogProgressBinding.inflate(LayoutInflater.from(context))
                         dialogBinding.progressBar.isIndeterminate = true
@@ -233,6 +261,10 @@ class ReleaseAdapter(
                                     driverViewModel.onDriverAdded(Pair(driverPath, driverData))
 
                                     progressDialog.dismiss()
+                                    // Update button to installed state
+                                    this@apply.isEnabled = false
+                                    this@apply.text = context.getString(R.string.installed_label, artifact.name)
+                                    this@apply.setIconResource(R.drawable.ic_check)
                                     Toast.makeText(
                                         context,
                                         context.getString(

src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GpuDriverHelper.kt

@@ -238,4 +238,18 @@ object GpuDriverHelper {
             driverStorageDirectory.mkdirs()
         }
     }
+
+    /**
+     * Checks if a driver zip with the given filename is already present and valid in the
+     * internal driver storage directory. Validation requires a readable meta.json with a name.
+     */
+    fun isDriverZipInstalledByName(fileName: String): Boolean {
+        // Normalize separators in case upstream sent a path
+        val baseName = fileName.substringAfterLast('/')
+            .substringAfterLast('\\')
+        val candidate = File("$driverStoragePath$baseName")
+        if (!candidate.exists() || candidate.length() == 0L) return false
+        val metadata = getMetadataFromZip(candidate)
+        return metadata.name != null
+    }
 }

src/android/app/src/main/res/values/strings.xml

@@ -661,6 +661,7 @@
     <string name="select_gpu_driver_default">Default</string>
     <string name="select_gpu_driver_error">Invalid driver selected</string>
     <string name="driver_already_installed">Driver already installed</string>
+    <string name="installed_label">%1$s (Installed)</string>
     <string name="system_gpu_driver">System GPU driver</string>
     <string name="installing_driver">Installing driver…</string>
 

src/network/announce_multiplayer_session.cpp

@@ -19,6 +19,9 @@
 
 namespace Core {
 
+// Time between room is announced to web_service
+static constexpr std::chrono::seconds announce_time_interval(15);
+
 AnnounceMultiplayerSession::AnnounceMultiplayerSession() {
 #ifdef ENABLE_WEB_SERVICE
     backend = std::make_unique<WebService::RoomJson>(Settings::values.web_api_url.GetValue(),
@@ -50,58 +53,18 @@ WebService::WebResult AnnounceMultiplayerSession::Register() {
 }
 
 void AnnounceMultiplayerSession::Start() {
-    if (announce_multiplayer_thread.has_value()) {
+    if (announce_multiplayer_thread) {
         Stop();
     }
-    announce_multiplayer_thread.emplace([&](std::stop_token stoken) {
-        // Invokes all current bound error callbacks.
-        const auto ErrorCallback = [this](WebService::WebResult result) {
-            std::lock_guard lock(callback_mutex);
-            for (auto callback : error_callbacks)
-                (*callback)(result);
-        };
-
-        if (!registered) {
-            WebService::WebResult result = Register();
-            if (result.result_code != WebService::WebResult::Code::Success) {
-                ErrorCallback(result);
-                return;
-            }
-        }
-
-        // Time between room is announced to web_service
-        std::chrono::seconds const announce_timeslice(15);
-        auto update_time = std::chrono::steady_clock::now();
-        std::future<WebService::WebResult> future;
-        while (!shutdown_event.WaitUntil(update_time)) {
-            update_time = std::chrono::steady_clock::now() + announce_timeslice;
-            auto room = Network::GetRoom().lock();
-            if (!room) {
-                break;
-            }
-            if (room->GetState() != Network::Room::State::Open) {
-                break;
-            }
-            UpdateBackendData(room);
-            WebService::WebResult result = backend->Update();
-            if (result.result_code != WebService::WebResult::Code::Success) {
-                ErrorCallback(result);
-            }
-            if (result.result_string == "404") {
-                registered = false;
-                // Needs to register the room again
-                WebService::WebResult register_result = Register();
-                if (register_result.result_code != WebService::WebResult::Code::Success) {
-                    ErrorCallback(register_result);
-                }
-            }
-        }
-    });
+    shutdown_event.Reset();
+    announce_multiplayer_thread =
+        std::make_unique<std::thread>(&AnnounceMultiplayerSession::AnnounceMultiplayerLoop, this);
 }
 
 void AnnounceMultiplayerSession::Stop() {
-    if (announce_multiplayer_thread.has_value()) {
+    if (announce_multiplayer_thread) {
         shutdown_event.Set();
+        announce_multiplayer_thread->join();
         announce_multiplayer_thread.reset();
         backend->Delete();
         registered = false;
@@ -138,10 +101,58 @@ void AnnounceMultiplayerSession::UpdateBackendData(std::shared_ptr<Network::Room
     }
 }
 
+void AnnounceMultiplayerSession::AnnounceMultiplayerLoop() {
+    // Invokes all current bound error callbacks.
+    const auto ErrorCallback = [this](WebService::WebResult result) {
+        std::lock_guard lock(callback_mutex);
+        for (auto callback : error_callbacks) {
+            (*callback)(result);
+        }
+    };
+
+    if (!registered) {
+        WebService::WebResult result = Register();
+        if (result.result_code != WebService::WebResult::Code::Success) {
+            ErrorCallback(result);
+            return;
+        }
+    }
+
+    auto update_time = std::chrono::steady_clock::now();
+    std::future<WebService::WebResult> future;
+    while (!shutdown_event.WaitUntil(update_time)) {
+        update_time += announce_time_interval;
+        auto room = Network::GetRoom().lock();
+        if (!room) {
+            break;
+        }
+        if (room->GetState() != Network::Room::State::Open) {
+            break;
+        }
+        UpdateBackendData(room);
+        WebService::WebResult result = backend->Update();
+        if (result.result_code != WebService::WebResult::Code::Success) {
+            ErrorCallback(result);
+        }
+        if (result.result_string == "404") {
+            registered = false;
+            // Needs to register the room again
+            WebService::WebResult register_result = Register();
+            if (register_result.result_code != WebService::WebResult::Code::Success) {
+                ErrorCallback(register_result);
+            }
+        }
+    }
+}
+
 AnnounceMultiplayerRoom::RoomList AnnounceMultiplayerSession::GetRoomList() {
     return backend->GetRoomList();
 }
 
+bool AnnounceMultiplayerSession::IsRunning() const {
+    return announce_multiplayer_thread != nullptr;
+}
+
 void AnnounceMultiplayerSession::UpdateCredentials() {
     ASSERT_MSG(!IsRunning(), "Credentials can only be updated when session is not running");
 #ifdef ENABLE_WEB_SERVICE

src/network/announce_multiplayer_session.h

@@ -72,9 +72,7 @@ public:
     /**
      * Whether the announce session is still running
      */
-    [[nodiscard]] bool IsRunning() const {
-        return announce_multiplayer_thread.has_value();
-    }
+    bool IsRunning() const;
 
     /**
      * Recreates the backend, updating the credentials.
@@ -84,13 +82,16 @@ public:
 
 private:
     void UpdateBackendData(std::shared_ptr<Network::Room> room);
+    void AnnounceMultiplayerLoop();
 
     Common::Event shutdown_event;
+    std::mutex callback_mutex;
     std::set<CallbackHandle> error_callbacks;
-    std::optional<std::jthread> announce_multiplayer_thread;
+    std::unique_ptr<std::thread> announce_multiplayer_thread;
+
     /// Backend interface that logs fields
     std::unique_ptr<AnnounceMultiplayerRoom::Backend> backend;
-    std::mutex callback_mutex;
+
     std::atomic_bool registered = false; ///< Whether the room has been registered
 };
 

src/network/room.cpp

@@ -1,5 +1,6 @@
 // SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2017 Citra Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -12,7 +13,6 @@
 #include <shared_mutex>
 #include <sstream>
 #include <thread>
-#include "common/polyfill_thread.h"
 #include "common/logging/log.h"
 #include "enet/enet.h"
 #include "network/packet.h"
@@ -54,11 +54,13 @@ public:
     RoomImpl() : random_gen(std::random_device()()) {}
 
     /// Thread that receives and dispatches network packets
-    std::optional<std::jthread> room_thread;
+    std::unique_ptr<std::thread> room_thread;
 
     /// Verification backend of the room
     std::unique_ptr<VerifyUser::Backend> verify_backend;
 
+    /// Thread function that will receive and dispatch messages until the room is destroyed.
+    void ServerLoop();
     void StartLoop();
 
     /**
@@ -238,57 +240,59 @@ public:
 };
 
 // RoomImpl
-void Room::RoomImpl::StartLoop() {
-    room_thread.emplace([&](std::stop_token stoken) {
-        while (state != State::Closed) {
-            ENetEvent event;
-            if (enet_host_service(server, &event, 5) > 0) {
-                switch (event.type) {
-                case ENET_EVENT_TYPE_RECEIVE:
-                    switch (event.packet->data[0]) {
-                    case IdJoinRequest:
-                        HandleJoinRequest(&event);
-                        break;
-                    case IdSetGameInfo:
-                        HandleGameInfoPacket(&event);
-                        break;
-                    case IdProxyPacket:
-                        HandleProxyPacket(&event);
-                        break;
-                    case IdLdnPacket:
-                        HandleLdnPacket(&event);
-                        break;
-                    case IdChatMessage:
-                        HandleChatPacket(&event);
-                        break;
-                    // Moderation
-                    case IdModKick:
-                        HandleModKickPacket(&event);
-                        break;
-                    case IdModBan:
-                        HandleModBanPacket(&event);
-                        break;
-                    case IdModUnban:
-                        HandleModUnbanPacket(&event);
-                        break;
-                    case IdModGetBanList:
-                        HandleModGetBanListPacket(&event);
-                        break;
-                    }
-                    enet_packet_destroy(event.packet);
+void Room::RoomImpl::ServerLoop() {
+    while (state != State::Closed) {
+        ENetEvent event;
+        if (enet_host_service(server, &event, 5) > 0) {
+            switch (event.type) {
+            case ENET_EVENT_TYPE_RECEIVE:
+                switch (event.packet->data[0]) {
+                case IdJoinRequest:
+                    HandleJoinRequest(&event);
                     break;
-                case ENET_EVENT_TYPE_DISCONNECT:
-                    HandleClientDisconnection(event.peer);
+                case IdSetGameInfo:
+                    HandleGameInfoPacket(&event);
                     break;
-                case ENET_EVENT_TYPE_NONE:
-                case ENET_EVENT_TYPE_CONNECT:
+                case IdProxyPacket:
+                    HandleProxyPacket(&event);
+                    break;
+                case IdLdnPacket:
+                    HandleLdnPacket(&event);
+                    break;
+                case IdChatMessage:
+                    HandleChatPacket(&event);
+                    break;
+                // Moderation
+                case IdModKick:
+                    HandleModKickPacket(&event);
+                    break;
+                case IdModBan:
+                    HandleModBanPacket(&event);
+                    break;
+                case IdModUnban:
+                    HandleModUnbanPacket(&event);
+                    break;
+                case IdModGetBanList:
+                    HandleModGetBanListPacket(&event);
                     break;
                 }
+                enet_packet_destroy(event.packet);
+                break;
+            case ENET_EVENT_TYPE_DISCONNECT:
+                HandleClientDisconnection(event.peer);
+                break;
+            case ENET_EVENT_TYPE_NONE:
+            case ENET_EVENT_TYPE_CONNECT:
+                break;
             }
         }
-        // Close the connection to all members:
-        SendCloseMessage();
-    });
+    }
+    // Close the connection to all members:
+    SendCloseMessage();
+}
+
+void Room::RoomImpl::StartLoop() {
+    room_thread = std::make_unique<std::thread>(&Room::RoomImpl::ServerLoop, this);
 }
 
 void Room::RoomImpl::HandleJoinRequest(const ENetEvent* event) {
@@ -1129,6 +1133,7 @@ void Room::SetVerifyUID(const std::string& uid) {
 
 void Room::Destroy() {
     room_impl->state = State::Closed;
+    room_impl->room_thread->join();
     room_impl->room_thread.reset();
 
     if (room_impl->server) {

src/network/room_member.cpp

@@ -1,5 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
 // SPDX-FileCopyrightText: Copyright 2017 Citra Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -9,7 +7,6 @@
 #include <set>
 #include <thread>
 #include "common/assert.h"
-#include "common/polyfill_thread.h"
 #include "common/socket_types.h"
 #include "enet/enet.h"
 #include "network/packet.h"
@@ -21,21 +18,6 @@ constexpr u32 ConnectionTimeoutMs = 5000;
 
 class RoomMember::RoomMemberImpl {
 public:
-    void SetState(const State new_state) noexcept {
-        if (state != new_state) {
-            state = new_state;
-            Invoke<State>(state);
-        }
-    }
-
-    void SetError(const Error new_error) noexcept {
-        Invoke<Error>(new_error);
-    }
-
-    [[nodiscard]] bool IsConnected() const noexcept {
-        return state == State::Joining || state == State::Joined || state == State::Moderator;
-    }
-
     ENetHost* client = nullptr; ///< ENet network interface.
     ENetPeer* server = nullptr; ///< The server peer the client is connected to
 
@@ -48,6 +30,9 @@ public:
     GameInfo current_game_info;
 
     std::atomic<State> state{State::Idle}; ///< Current state of the RoomMember.
+    void SetState(const State new_state);
+    void SetError(const Error new_error);
+    bool IsConnected() const;
 
     std::string nickname; ///< The nickname of this member.
 
@@ -58,9 +43,9 @@ public:
 
     std::mutex network_mutex; ///< Mutex that controls access to the `client` variable.
     /// Thread that receives and dispatches network packets
-    std::optional<std::jthread> loop_thread;
+    std::unique_ptr<std::thread> loop_thread;
     std::mutex send_list_mutex;  ///< Mutex that controls access to the `send_list` variable.
-    std::vector<Packet> send_list; ///< A list that stores all packets to send the async
+    std::list<Packet> send_list; ///< A list that stores all packets to send the async
 
     template <typename T>
     using CallbackSet = std::set<CallbackHandle<T>>;
@@ -83,6 +68,8 @@ public:
     };
     Callbacks callbacks; ///< All CallbackSets to all events
 
+    void MemberLoop();
+
     void StartLoop();
 
     /**
@@ -159,117 +146,134 @@ public:
 };
 
 // RoomMemberImpl
-void RoomMember::RoomMemberImpl::StartLoop() {
-    loop_thread.emplace([&](std::stop_token stoken) {
-        // Receive packets while the connection is open
-        while (IsConnected()) {
-            std::lock_guard lock(network_mutex);
-            ENetEvent event;
-            if (enet_host_service(client, &event, 5) > 0) {
-                switch (event.type) {
-                case ENET_EVENT_TYPE_RECEIVE:
-                    switch (event.packet->data[0]) {
-                    case IdProxyPacket:
-                        HandleProxyPackets(&event);
-                        break;
-                    case IdLdnPacket:
-                        HandleLdnPackets(&event);
-                        break;
-                    case IdChatMessage:
-                        HandleChatPacket(&event);
-                        break;
-                    case IdStatusMessage:
-                        HandleStatusMessagePacket(&event);
-                        break;
-                    case IdRoomInformation:
-                        HandleRoomInformationPacket(&event);
-                        break;
-                    case IdJoinSuccess:
-                    case IdJoinSuccessAsMod:
-                        // The join request was successful, we are now in the room.
-                        // If we joined successfully, there must be at least one client in the room: us.
-                        ASSERT_MSG(member_information.size() > 0,
-                                "We have not yet received member information.");
-                        HandleJoinPacket(&event); // Get the MAC Address for the client
-                        if (event.packet->data[0] == IdJoinSuccessAsMod) {
-                            SetState(State::Moderator);
-                        } else {
-                            SetState(State::Joined);
-                        }
-                        break;
-                    case IdModBanListResponse:
-                        HandleModBanListResponsePacket(&event);
-                        break;
-                    case IdRoomIsFull:
-                        SetState(State::Idle);
-                        SetError(Error::RoomIsFull);
-                        break;
-                    case IdNameCollision:
-                        SetState(State::Idle);
-                        SetError(Error::NameCollision);
-                        break;
-                    case IdIpCollision:
-                        SetState(State::Idle);
-                        SetError(Error::IpCollision);
-                        break;
-                    case IdVersionMismatch:
-                        SetState(State::Idle);
-                        SetError(Error::WrongVersion);
-                        break;
-                    case IdWrongPassword:
-                        SetState(State::Idle);
-                        SetError(Error::WrongPassword);
-                        break;
-                    case IdCloseRoom:
-                        SetState(State::Idle);
-                        SetError(Error::LostConnection);
-                        break;
-                    case IdHostKicked:
-                        SetState(State::Idle);
-                        SetError(Error::HostKicked);
-                        break;
-                    case IdHostBanned:
-                        SetState(State::Idle);
-                        SetError(Error::HostBanned);
-                        break;
-                    case IdModPermissionDenied:
-                        SetError(Error::PermissionDenied);
-                        break;
-                    case IdModNoSuchUser:
-                        SetError(Error::NoSuchUser);
-                        break;
-                    }
-                    enet_packet_destroy(event.packet);
+void RoomMember::RoomMemberImpl::SetState(const State new_state) {
+    if (state != new_state) {
+        state = new_state;
+        Invoke<State>(state);
+    }
+}
+
+void RoomMember::RoomMemberImpl::SetError(const Error new_error) {
+    Invoke<Error>(new_error);
+}
+
+bool RoomMember::RoomMemberImpl::IsConnected() const {
+    return state == State::Joining || state == State::Joined || state == State::Moderator;
+}
+
+void RoomMember::RoomMemberImpl::MemberLoop() {
+    // Receive packets while the connection is open
+    while (IsConnected()) {
+        std::lock_guard lock(network_mutex);
+        ENetEvent event;
+        if (enet_host_service(client, &event, 5) > 0) {
+            switch (event.type) {
+            case ENET_EVENT_TYPE_RECEIVE:
+                switch (event.packet->data[0]) {
+                case IdProxyPacket:
+                    HandleProxyPackets(&event);
                     break;
-                case ENET_EVENT_TYPE_DISCONNECT:
-                    if (state == State::Joined || state == State::Moderator) {
-                        SetState(State::Idle);
-                        SetError(Error::LostConnection);
+                case IdLdnPacket:
+                    HandleLdnPackets(&event);
+                    break;
+                case IdChatMessage:
+                    HandleChatPacket(&event);
+                    break;
+                case IdStatusMessage:
+                    HandleStatusMessagePacket(&event);
+                    break;
+                case IdRoomInformation:
+                    HandleRoomInformationPacket(&event);
+                    break;
+                case IdJoinSuccess:
+                case IdJoinSuccessAsMod:
+                    // The join request was successful, we are now in the room.
+                    // If we joined successfully, there must be at least one client in the room: us.
+                    ASSERT_MSG(member_information.size() > 0,
+                               "We have not yet received member information.");
+                    HandleJoinPacket(&event); // Get the MAC Address for the client
+                    if (event.packet->data[0] == IdJoinSuccessAsMod) {
+                        SetState(State::Moderator);
+                    } else {
+                        SetState(State::Joined);
                     }
                     break;
-                case ENET_EVENT_TYPE_NONE:
+                case IdModBanListResponse:
+                    HandleModBanListResponsePacket(&event);
                     break;
-                case ENET_EVENT_TYPE_CONNECT:
-                    // The ENET_EVENT_TYPE_CONNECT event can not possibly happen here because we're
-                    // already connected
-                    ASSERT_MSG(false, "Received unexpected connect event while already connected");
+                case IdRoomIsFull:
+                    SetState(State::Idle);
+                    SetError(Error::RoomIsFull);
+                    break;
+                case IdNameCollision:
+                    SetState(State::Idle);
+                    SetError(Error::NameCollision);
+                    break;
+                case IdIpCollision:
+                    SetState(State::Idle);
+                    SetError(Error::IpCollision);
+                    break;
+                case IdVersionMismatch:
+                    SetState(State::Idle);
+                    SetError(Error::WrongVersion);
+                    break;
+                case IdWrongPassword:
+                    SetState(State::Idle);
+                    SetError(Error::WrongPassword);
+                    break;
+                case IdCloseRoom:
+                    SetState(State::Idle);
+                    SetError(Error::LostConnection);
+                    break;
+                case IdHostKicked:
+                    SetState(State::Idle);
+                    SetError(Error::HostKicked);
+                    break;
+                case IdHostBanned:
+                    SetState(State::Idle);
+                    SetError(Error::HostBanned);
+                    break;
+                case IdModPermissionDenied:
+                    SetError(Error::PermissionDenied);
+                    break;
+                case IdModNoSuchUser:
+                    SetError(Error::NoSuchUser);
                     break;
                 }
+                enet_packet_destroy(event.packet);
+                break;
+            case ENET_EVENT_TYPE_DISCONNECT:
+                if (state == State::Joined || state == State::Moderator) {
+                    SetState(State::Idle);
+                    SetError(Error::LostConnection);
+                }
+                break;
+            case ENET_EVENT_TYPE_NONE:
+                break;
+            case ENET_EVENT_TYPE_CONNECT:
+                // The ENET_EVENT_TYPE_CONNECT event can not possibly happen here because we're
+                // already connected
+                ASSERT_MSG(false, "Received unexpected connect event while already connected");
+                break;
             }
-            std::vector<Packet> packets;
-            {
-                std::lock_guard send_lock(send_list_mutex);
-                packets.swap(send_list);
-            }
-            for (auto const& packet : packets) {
-                ENetPacket* enetPacket = enet_packet_create(packet.GetData(), packet.GetDataSize(),
-                                                            ENET_PACKET_FLAG_RELIABLE);
-                enet_peer_send(server, 0, enetPacket);
-            }
-            enet_host_flush(client);
         }
-        Disconnect();
-    });
+        std::list<Packet> packets;
+        {
+            std::lock_guard send_lock(send_list_mutex);
+            packets.swap(send_list);
+        }
+        for (const auto& packet : packets) {
+            ENetPacket* enetPacket = enet_packet_create(packet.GetData(), packet.GetDataSize(),
+                                                        ENET_PACKET_FLAG_RELIABLE);
+            enet_peer_send(server, 0, enetPacket);
+        }
+        enet_host_flush(client);
+    }
+    Disconnect();
+};
+
+void RoomMember::RoomMemberImpl::StartLoop() {
+    loop_thread = std::make_unique<std::thread>(&RoomMember::RoomMemberImpl::MemberLoop, this);
 }
 
 void RoomMember::RoomMemberImpl::Send(Packet&& packet) {
@@ -743,7 +747,9 @@ void RoomMember::Unbind(CallbackHandle<T> handle) {
 
 void RoomMember::Leave() {
     room_member_impl->SetState(State::Idle);
+    room_member_impl->loop_thread->join();
     room_member_impl->loop_thread.reset();
+
     enet_host_destroy(room_member_impl->client);
     room_member_impl->client = nullptr;
 }

src/tests/input_common/calibration_configuration_job.cpp

@@ -22,9 +22,13 @@ public:
         : socket(io_context, boost::asio::ip::udp::endpoint(boost::asio::ip::udp::v4(), 0)) {}
 
     ~FakeCemuhookServer() {
+        is_running = false;
         boost::system::error_code error_code;
         socket.shutdown(boost::asio::socket_base::shutdown_both, error_code);
         socket.close();
+        if (handler.joinable()) {
+            handler.join();
+        }
     }
 
     u16 GetPort() {
@@ -41,9 +45,10 @@ public:
             sizeof(InputCommon::CemuhookUDP::Message<InputCommon::CemuhookUDP::Response::PadData>);
 
         REQUIRE(touch_movement_path.size() > 0);
-        handler = std::jthread([touch_movement_path, this](std::stop_token stoken) {
+        is_running = true;
+        handler = std::thread([touch_movement_path, this]() {
             auto current_touch_position = touch_movement_path.begin();
-            while (!stoken.stop_requested()) {
+            while (is_running) {
                 boost::asio::ip::udp::endpoint sender_endpoint;
                 boost::system::error_code error_code;
                 auto received_size = socket.receive_from(boost::asio::buffer(receive_buffer),
@@ -86,7 +91,8 @@ private:
     boost::asio::ip::udp::socket socket;
     std::array<u8, InputCommon::CemuhookUDP::MAX_PACKET_SIZE> send_buffer;
     std::array<u8, InputCommon::CemuhookUDP::MAX_PACKET_SIZE> receive_buffer;
-    std::jthread handler;
+    bool is_running = false;
+    std::thread handler;
 };
 
 TEST_CASE("CalibrationConfigurationJob completed", "[input_common]") {

src/yuzu/applets/qt_software_keyboard.cpp

@@ -1,5 +1,6 @@
 // SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -1494,36 +1495,53 @@ void QtSoftwareKeyboardDialog::MoveTextCursorDirection(Direction direction) {
 }
 
 void QtSoftwareKeyboardDialog::StartInputThread() {
-    input_thread = std::jthread([&](std::stop_token stoken) {
-        while (!stoken.stop_requested()) {
-            input_interpreter->PollInput();
-            HandleButtonPressedOnce<
-                Core::HID::NpadButton::A, Core::HID::NpadButton::B, Core::HID::NpadButton::X,
-                Core::HID::NpadButton::Y, Core::HID::NpadButton::StickL, Core::HID::NpadButton::StickR,
-                Core::HID::NpadButton::L, Core::HID::NpadButton::R, Core::HID::NpadButton::Plus,
-                Core::HID::NpadButton::Left, Core::HID::NpadButton::Up, Core::HID::NpadButton::Right,
-                Core::HID::NpadButton::Down, Core::HID::NpadButton::StickLLeft,
-                Core::HID::NpadButton::StickLUp, Core::HID::NpadButton::StickLRight,
-                Core::HID::NpadButton::StickLDown, Core::HID::NpadButton::StickRLeft,
-                Core::HID::NpadButton::StickRUp, Core::HID::NpadButton::StickRRight,
-                Core::HID::NpadButton::StickRDown>();
-            HandleButtonHold<Core::HID::NpadButton::B, Core::HID::NpadButton::L,
-                Core::HID::NpadButton::R, Core::HID::NpadButton::Left,
-                Core::HID::NpadButton::Up, Core::HID::NpadButton::Right,
-                Core::HID::NpadButton::Down, Core::HID::NpadButton::StickLLeft,
-                Core::HID::NpadButton::StickLUp, Core::HID::NpadButton::StickLRight,
-                Core::HID::NpadButton::StickLDown, Core::HID::NpadButton::StickRLeft,
-                Core::HID::NpadButton::StickRUp, Core::HID::NpadButton::StickRRight,
-                Core::HID::NpadButton::StickRDown>();
-            std::this_thread::sleep_for(std::chrono::milliseconds(50));
-        }
-    });
+    if (input_thread_running) {
+        return;
+    }
+
+    input_thread_running = true;
+
+    input_thread = std::thread(&QtSoftwareKeyboardDialog::InputThread, this);
 }
 
 void QtSoftwareKeyboardDialog::StopInputThread() {
-    input_thread.request_stop();
-    if (input_interpreter)
+    input_thread_running = false;
+
+    if (input_thread.joinable()) {
+        input_thread.join();
+    }
+
+    if (input_interpreter) {
         input_interpreter->ResetButtonStates();
+    }
+}
+
+void QtSoftwareKeyboardDialog::InputThread() {
+    while (input_thread_running) {
+        input_interpreter->PollInput();
+
+        HandleButtonPressedOnce<
+            Core::HID::NpadButton::A, Core::HID::NpadButton::B, Core::HID::NpadButton::X,
+            Core::HID::NpadButton::Y, Core::HID::NpadButton::StickL, Core::HID::NpadButton::StickR,
+            Core::HID::NpadButton::L, Core::HID::NpadButton::R, Core::HID::NpadButton::Plus,
+            Core::HID::NpadButton::Left, Core::HID::NpadButton::Up, Core::HID::NpadButton::Right,
+            Core::HID::NpadButton::Down, Core::HID::NpadButton::StickLLeft,
+            Core::HID::NpadButton::StickLUp, Core::HID::NpadButton::StickLRight,
+            Core::HID::NpadButton::StickLDown, Core::HID::NpadButton::StickRLeft,
+            Core::HID::NpadButton::StickRUp, Core::HID::NpadButton::StickRRight,
+            Core::HID::NpadButton::StickRDown>();
+
+        HandleButtonHold<Core::HID::NpadButton::B, Core::HID::NpadButton::L,
+                         Core::HID::NpadButton::R, Core::HID::NpadButton::Left,
+                         Core::HID::NpadButton::Up, Core::HID::NpadButton::Right,
+                         Core::HID::NpadButton::Down, Core::HID::NpadButton::StickLLeft,
+                         Core::HID::NpadButton::StickLUp, Core::HID::NpadButton::StickLRight,
+                         Core::HID::NpadButton::StickLDown, Core::HID::NpadButton::StickRLeft,
+                         Core::HID::NpadButton::StickRUp, Core::HID::NpadButton::StickRRight,
+                         Core::HID::NpadButton::StickRDown>();
+
+        std::this_thread::sleep_for(std::chrono::milliseconds(50));
+    }
 }
 
 QtSoftwareKeyboard::QtSoftwareKeyboard(MainWindow& main_window) {

src/yuzu/applets/qt_software_keyboard.h

@@ -1,5 +1,6 @@
 // SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -184,6 +185,9 @@ private:
     void StartInputThread();
     void StopInputThread();
 
+    /// The thread where input is being polled and processed.
+    void InputThread();
+
     std::unique_ptr<Ui::QtSoftwareKeyboardDialog> ui;
 
     Core::System& system;
@@ -219,7 +223,10 @@ private:
     std::atomic<bool> caps_lock_enabled{false};
 
     std::unique_ptr<InputInterpreter> input_interpreter;
-    std::jthread input_thread;
+
+    std::thread input_thread;
+
+    std::atomic<bool> input_thread_running{};
 };
 
 class QtSoftwareKeyboard final : public QObject, public Core::Frontend::SoftwareKeyboardApplet {

src/yuzu/applets/qt_web_browser.cpp

@@ -285,41 +285,54 @@ void QtNXWebEngineView::SendKeyPressEvent(int key) {
 }
 
 void QtNXWebEngineView::StartInputThread() {
-    input_thread = std::jthread([&](std::stop_token stoken) {
-        // Wait for 1 second before allowing any inputs to be processed.
-        std::this_thread::sleep_for(std::chrono::seconds(1));
-        if (is_local) {
-            QWidget::grabKeyboard();
-        }
-        while (!stoken.stop_requested()) {
-            input_interpreter->PollInput();
+    if (input_thread_running) {
+        return;
+    }
 
-            HandleWindowFooterButtonPressedOnce<Core::HID::NpadButton::A, Core::HID::NpadButton::B,
-                                                Core::HID::NpadButton::X, Core::HID::NpadButton::Y,
-                                                Core::HID::NpadButton::L, Core::HID::NpadButton::R>();
-
-            HandleWindowKeyButtonPressedOnce<
-                Core::HID::NpadButton::Left, Core::HID::NpadButton::Up, Core::HID::NpadButton::Right,
-                Core::HID::NpadButton::Down, Core::HID::NpadButton::StickLLeft,
-                Core::HID::NpadButton::StickLUp, Core::HID::NpadButton::StickLRight,
-                Core::HID::NpadButton::StickLDown>();
-
-            HandleWindowKeyButtonHold<
-                Core::HID::NpadButton::Left, Core::HID::NpadButton::Up, Core::HID::NpadButton::Right,
-                Core::HID::NpadButton::Down, Core::HID::NpadButton::StickLLeft,
-                Core::HID::NpadButton::StickLUp, Core::HID::NpadButton::StickLRight,
-                Core::HID::NpadButton::StickLDown>();
-
-            std::this_thread::sleep_for(std::chrono::milliseconds(50));
-        }
-    });
+    input_thread_running = true;
+    input_thread = std::thread(&QtNXWebEngineView::InputThread, this);
 }
 
 void QtNXWebEngineView::StopInputThread() {
     if (is_local) {
         QWidget::releaseKeyboard();
     }
-    input_thread.request_stop();
+
+    input_thread_running = false;
+    if (input_thread.joinable()) {
+        input_thread.join();
+    }
+}
+
+void QtNXWebEngineView::InputThread() {
+    // Wait for 1 second before allowing any inputs to be processed.
+    std::this_thread::sleep_for(std::chrono::seconds(1));
+
+    if (is_local) {
+        QWidget::grabKeyboard();
+    }
+
+    while (input_thread_running) {
+        input_interpreter->PollInput();
+
+        HandleWindowFooterButtonPressedOnce<Core::HID::NpadButton::A, Core::HID::NpadButton::B,
+                                            Core::HID::NpadButton::X, Core::HID::NpadButton::Y,
+                                            Core::HID::NpadButton::L, Core::HID::NpadButton::R>();
+
+        HandleWindowKeyButtonPressedOnce<
+            Core::HID::NpadButton::Left, Core::HID::NpadButton::Up, Core::HID::NpadButton::Right,
+            Core::HID::NpadButton::Down, Core::HID::NpadButton::StickLLeft,
+            Core::HID::NpadButton::StickLUp, Core::HID::NpadButton::StickLRight,
+            Core::HID::NpadButton::StickLDown>();
+
+        HandleWindowKeyButtonHold<
+            Core::HID::NpadButton::Left, Core::HID::NpadButton::Up, Core::HID::NpadButton::Right,
+            Core::HID::NpadButton::Down, Core::HID::NpadButton::StickLLeft,
+            Core::HID::NpadButton::StickLUp, Core::HID::NpadButton::StickLRight,
+            Core::HID::NpadButton::StickLDown>();
+
+        std::this_thread::sleep_for(std::chrono::milliseconds(50));
+    }
 }
 
 void QtNXWebEngineView::LoadExtractedFonts() {

src/yuzu/applets/qt_web_browser.h

@@ -158,6 +158,9 @@ private:
     void StartInputThread();
     void StopInputThread();
 
+    /// The thread where input is being polled and processed.
+    void InputThread();
+
     /// Loads the extracted fonts using JavaScript.
     void LoadExtractedFonts();
 
@@ -165,13 +168,24 @@ private:
     void FocusFirstLinkElement();
 
     InputCommon::InputSubsystem* input_subsystem;
+
     std::unique_ptr<UrlRequestInterceptor> url_interceptor;
+
     std::unique_ptr<InputInterpreter> input_interpreter;
-    std::jthread input_thread;
+
+    std::thread input_thread;
+
+    std::atomic<bool> input_thread_running{};
+
     std::atomic<bool> finished{};
-    Service::AM::Frontend::WebExitReason exit_reason{Service::AM::Frontend::WebExitReason::EndButtonPressed};
+
+    Service::AM::Frontend::WebExitReason exit_reason{
+        Service::AM::Frontend::WebExitReason::EndButtonPressed};
+
     std::string last_url{"http://localhost/"};
+
     bool is_local{};
+
     QWebEngineProfile* default_profile;
     QWebEngineSettings* global_settings;
 };

src/yuzu/util/overlay_dialog.cpp

@@ -1,5 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
 // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -233,20 +231,34 @@ void OverlayDialog::TranslateButtonPress(Core::HID::NpadButton button) {
 }
 
 void OverlayDialog::StartInputThread() {
-    input_thread = std::jthread([&](std::stop_token stoken) {
-        while (!stoken.stop_requested()) {
-            input_interpreter->PollInput();
-            HandleButtonPressedOnce<Core::HID::NpadButton::A, Core::HID::NpadButton::B,
-                                    Core::HID::NpadButton::Left, Core::HID::NpadButton::Right,
-                                    Core::HID::NpadButton::StickLLeft,
-                                    Core::HID::NpadButton::StickLRight>();
-            std::this_thread::sleep_for(std::chrono::milliseconds(50));
-        }
-    });
+    if (input_thread_running) {
+        return;
+    }
+
+    input_thread_running = true;
+
+    input_thread = std::thread(&OverlayDialog::InputThread, this);
 }
 
 void OverlayDialog::StopInputThread() {
-    input_thread.request_stop();
+    input_thread_running = false;
+
+    if (input_thread.joinable()) {
+        input_thread.join();
+    }
+}
+
+void OverlayDialog::InputThread() {
+    while (input_thread_running) {
+        input_interpreter->PollInput();
+
+        HandleButtonPressedOnce<Core::HID::NpadButton::A, Core::HID::NpadButton::B,
+                                Core::HID::NpadButton::Left, Core::HID::NpadButton::Right,
+                                Core::HID::NpadButton::StickLLeft,
+                                Core::HID::NpadButton::StickLRight>();
+
+        std::this_thread::sleep_for(std::chrono::milliseconds(50));
+    }
 }
 
 void OverlayDialog::keyPressEvent(QKeyEvent* e) {

src/yuzu/util/overlay_dialog.h

@@ -1,10 +1,9 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
 // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 
+#include <atomic>
 #include <memory>
 #include <thread>
 
@@ -92,6 +91,9 @@ private:
 
     void StartInputThread();
     void StopInputThread();
+
+    /// The thread where input is being polled and processed.
+    void InputThread();
     void keyPressEvent(QKeyEvent* e) override;
 
     std::unique_ptr<Ui::OverlayDialog> ui;
@@ -99,5 +101,8 @@ private:
     bool use_rich_text;
 
     std::unique_ptr<InputInterpreter> input_interpreter;
-    std::jthread input_thread;
+
+    std::thread input_thread;
+
+    std::atomic<bool> input_thread_running{};
 };