mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-04 13:20:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request from GregorR/netplay-server-spectator-fix-2-electric-boogaloo

Browse Source 
Yet another server-is-spectator bug. Don't ever ignore stalls if we're a client
This commit is contained in:
bparker06 2017-03-06 21:25:18 -05:00 committed by GitHub
commit ced1dc10c1
1 changed files with 10 additions and 11 deletions

21
network/netplay/netplay_frontend.c

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