Merge pull request #10237 from AdmiralCurtiss/netplay-server-crash

NetPlayServer: Clear remaining m_players when netplay thread ends so that their destructors can run while the ENetHost still exists.
dolphin-emu · Nov 21, 2021 · d5b917a · d5b917a
2 parents 37247a5 + e2c4cf4
commit d5b917a
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Source/Core/Core/NetPlayServer.cpp b/Source/Core/Core/NetPlayServer.cpp
@@ -357,7 +357,8 @@ void NetPlayServer::ThreadFunc()
     ClearPeerPlayerId(player_entry.second.socket);
     enet_peer_disconnect(player_entry.second.socket, 0);
   }
-}  // namespace NetPlay
+  m_players.clear();
+}
 
 static void SendSyncIdentifier(sf::Packet& spac, const SyncIdentifier& sync_identifier)
 {