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

Merge pull request #4355 from GregorR/netplay-load-savestate-server-not-playing

Browse Source 
LOAD_SAVESTATE can't use player frame timing from a server that's not playing
This commit is contained in:
Twinaphex 2017-01-03 01:18:34 +01:00 committed by GitHub
commit 6bd212a6ce
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
network/netplay/netplay_io.c
View File

@ -1084,7 +1084,8 @@ static bool netplay_get_cmd(netplay_t *netplay,
} }
frame = ntohl(frame); frame = ntohl(frame);
if (frame != netplay->read_frame_count[connection->player]) if ((netplay->is_server && frame != netplay->read_frame_count[connection->player]) ||
(!netplay->is_server && frame != netplay->server_frame_count))
{ {
RARCH_ERR("CMD_LOAD_SAVESTATE loading a state out of order!\n"); RARCH_ERR("CMD_LOAD_SAVESTATE loading a state out of order!\n");
return netplay_cmd_nak(netplay, connection); return netplay_cmd_nak(netplay, connection);