From ee55e2d7834bf64742ff051ed9e8527ca0658415 Mon Sep 17 00:00:00 2001 From: Gregor Richards Date: Mon, 2 Jan 2017 18:56:08 -0500 Subject: [PATCH] LOAD_SAVESTATE can't use player frame timing from a server that's not playing --- network/netplay/netplay_io.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/network/netplay/netplay_io.c b/network/netplay/netplay_io.c index a7fa861f3c..39dc167a56 100644 --- a/network/netplay/netplay_io.c +++ b/network/netplay/netplay_io.c @@ -1084,7 +1084,8 @@ static bool netplay_get_cmd(netplay_t *netplay, } 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"); return netplay_cmd_nak(netplay, connection);