mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 12:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Yet another server-is-spectator bug. Don't ever ignore stalls if we're a

Browse Source 
client
This commit is contained in:
Gregor Richards 2017-03-06 20:13:26 -05:00
parent d9c78c75f0
commit 2f21a3e370
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
network/netplay/netplay_frontend.c
View File

@ -200,7 +200,8 @@ static bool netplay_poll(void)
netplay_data->can_poll = false;
get_self_input_state(netplay_data);
if (!get_self_input_state(netplay_data))
goto catastrophe;
/* If we're not connected, we're done */
if (netplay_data->self_mode == NETPLAY_CONNECTION_NONE)
@ -216,12 +217,7 @@ static bool netplay_poll(void)
else
res = netplay_poll_net_input(netplay_data, false);
if (res == -1)
{
/* Catastrophe! */
for (i = 0; i < netplay_data->connections_size; i++)
netplay_hangup(netplay_data, &netplay_data->connections[i]);
return false;
}
goto catastrophe;
/* Simulate the input if we don't have real input */
netplay_simulate_input(netplay_data, netplay_data->run_ptr, false);
@ -425,14 +421,17 @@ static bool netplay_poll(void)
}
}
else
{
netplay_hangup(netplay_data, &netplay_data->connections[0]);
}
goto catastrophe;
return false;
}
}
return true;
catastrophe:
for (i = 0; i < netplay_data->connections_size; i++)
netplay_hangup(netplay_data, &netplay_data->connections[i]);
return false;
}
/**
@ -818,7 +817,7 @@ bool netplay_pre_frame(netplay_t *netplay)
sync_stalled = !netplay_sync_pre_frame(netplay);
if (sync_stalled ||
(netplay->connected_players &&
((!netplay->is_server || netplay->connected_players) &&
(netplay->stall || netplay->remote_paused)))
{
/* We may have received data even if we're stalled, so run post-frame