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

Make sure we flush a netplay pause message, so it isn't forgotten.

This commit is contained in:
Gregor Richards 2017-05-22 16:27:22 -04:00
parent 88a44a2c2e
commit 2681352d53
1 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
network/netplay/netplay_io.c
View File

@ -312,6 +312,29 @@ void netplay_send_raw_cmd_all(netplay_t *netplay,
} }
} }
/**
* netplay_send_flush_all
*
* Flush all of our output buffers
*/
static void netplay_send_flush_all(netplay_t *netplay,
struct netplay_connection *except)
{
size_t i;
for (i = 0; i < netplay->connections_size; i++)
{
struct netplay_connection *connection = &netplay->connections[i];
if (connection == except)
continue;
if (connection->active && connection->mode >= NETPLAY_CONNECTION_CONNECTED)
{
if (!netplay_send_flush(&connection->send_packet_buffer,
connection->fd, true))
netplay_hangup(netplay, connection);
}
}
}
static bool netplay_cmd_nak(netplay_t *netplay, static bool netplay_cmd_nak(netplay_t *netplay,
struct netplay_connection *connection) struct netplay_connection *connection)
{ {
@ -1308,9 +1331,14 @@ static bool netplay_get_cmd(netplay_t *netplay,
netplay->remote_paused = true; netplay->remote_paused = true;
if (netplay->is_server) if (netplay->is_server)
{ {
/* Inform peers */
snprintf(msg, sizeof(msg)-1, msg_hash_to_str(MSG_NETPLAY_PEER_PAUSED), connection->nick); snprintf(msg, sizeof(msg)-1, msg_hash_to_str(MSG_NETPLAY_PEER_PAUSED), connection->nick);
netplay_send_raw_cmd_all(netplay, connection, NETPLAY_CMD_PAUSE, netplay_send_raw_cmd_all(netplay, connection, NETPLAY_CMD_PAUSE,
connection->nick, NETPLAY_NICK_LEN); connection->nick, NETPLAY_NICK_LEN);
/* We may not reach post_frame soon, so flush the pause message
* immediately. */
netplay_send_flush_all(netplay, connection);
} }
else else
{ {