Merge pull request #7979 from Techjar/netplay-browser-possible-crash

UICommon/NetPlayIndex: Fix possible crash when Add is called again
dolphin-emu · Apr 11, 2019 · f2e3f69 · f2e3f69
2 parents e8c9644 + f1e06b8
commit f2e3f69
Showing 1 changed file with 5 additions and 0 deletions.
diff --git 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;