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

Fix disconnection not fully deinitializing Netplay.

This commit is contained in:
Gregor Richards 2017-08-18 14:13:39 -04:00
parent 6940019102
commit 584e12ed37
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
network/netplay/netplay_frontend.c
View File

@ -57,6 +57,8 @@ static unsigned server_port_deferred = 0;
static int reannounce = 0; static int reannounce = 0;
static bool is_mitm = false; static bool is_mitm = false;
bool netplay_disconnect(netplay_t *netplay);
/** /**
* netplay_is_alive: * netplay_is_alive:
* @netplay : pointer to netplay object * @netplay : pointer to netplay object
@ -825,6 +827,13 @@ bool netplay_pre_frame(netplay_t *netplay)
sync_stalled = !netplay_sync_pre_frame(netplay); sync_stalled = !netplay_sync_pre_frame(netplay);
/* If we're disconnected, deinitialize */
if (!netplay->is_server && !netplay->connections[0].active)
{
netplay_disconnect(netplay);
return true;
}
if (sync_stalled || if (sync_stalled ||
((!netplay->is_server || netplay->connected_players) && ((!netplay->is_server || netplay->connected_players) &&
(netplay->stall || netplay->remote_paused))) (netplay->stall || netplay->remote_paused)))
@ -860,6 +869,10 @@ void netplay_post_frame(netplay_t *netplay)
false)) false))
netplay_hangup(netplay, connection); netplay_hangup(netplay, connection);
} }
/* If we're disconnected, deinitialize */
if (!netplay->is_server && !netplay->connections[0].active)
netplay_disconnect(netplay);
} }
/** /**