ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2856 from mathieui/netplay-free 

[netplay] Fix a crash
This commit is contained in:
Markus Wick 2015-08-15 23:13:18 +02:00 committed by Jules Blok
parent 7950c77332
commit 24d8cc5c07
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Source/Core/Core/NetPlayServer.cpp
View File

@ -189,6 +189,8 @@ void NetPlayServer::ThreadFunc()
case ENET_EVENT_TYPE_DISCONNECT: case ENET_EVENT_TYPE_DISCONNECT:
{ {
std::lock_guard<std::recursive_mutex> lkg(m_crit.game); std::lock_guard<std::recursive_mutex> lkg(m_crit.game);
if (!netEvent.peer->data)
break;
auto it = m_players.find(*(PlayerId *)netEvent.peer->data); auto it = m_players.find(*(PlayerId *)netEvent.peer->data);
if (it != m_players.end()) if (it != m_players.end())
{ {
@ -229,6 +231,18 @@ unsigned int NetPlayServer::OnConnect(ENetPeer* socket)
} while (epack == nullptr); } while (epack == nullptr);
rpac.append(epack->data, epack->dataLength); rpac.append(epack->data, epack->dataLength);
// give new client first available id
PlayerId pid = 1;
for (auto i = m_players.begin(); i != m_players.end(); ++i)
{
if (i->second.pid == pid)
{
pid++;
i = m_players.begin();
}
}
socket->data = new PlayerId(pid);
std::string npver; std::string npver;
rpac >> npver; rpac >> npver;
// Dolphin netplay version // Dolphin netplay version
@ -247,25 +261,12 @@ unsigned int NetPlayServer::OnConnect(ENetPeer* socket)
m_update_pings = true; m_update_pings = true;
Client player; Client player;
player.pid = pid;
player.socket = socket; player.socket = socket;
rpac >> player.revision; rpac >> player.revision;
rpac >> player.name; rpac >> player.name;
enet_packet_destroy(epack); enet_packet_destroy(epack);
// give new client first available id
PlayerId pid = 1;
for (auto i = m_players.begin(); i != m_players.end(); ++i)
{
if (i->second.pid == pid)
{
pid++;
i = m_players.begin();
}
}
player.pid = pid;
socket->data = new PlayerId(pid);
// try to automatically assign new user a pad // try to automatically assign new user a pad
for (PadMapping& mapping : m_pad_map) for (PadMapping& mapping : m_pad_map)
{ {