From f1e06b89da3e5e07dcf290bbd82effeb70011ac5 Mon Sep 17 00:00:00 2001 From: Techjar Date: Wed, 10 Apr 2019 22:39:16 -0400 Subject: [PATCH] UICommon/NetPlayIndex: Fix possible crash when Add is called again --- Source/Core/UICommon/NetPlayIndex.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Source/Core/UICommon/NetPlayIndex.cpp b/Source/Core/UICommon/NetPlayIndex.cpp index 36cb103243..9915bb311d 100644 --- a/Source/Core/UICommon/NetPlayIndex.cpp +++ b/Source/Core/UICommon/NetPlayIndex.cpp @@ -197,6 +197,11 @@ bool NetPlayIndex::Add(NetPlaySession session) m_player_count = session.player_count; m_game = session.game_id; + m_session_thread_exit_event.Set(); + if (m_session_thread.joinable()) + m_session_thread.join(); + m_session_thread_exit_event.Reset(); + m_session_thread = std::thread([this] { NotificationLoop(); }); return true;