From 1503b3d42f0608448a4af7e49a6ab78e6374f3df Mon Sep 17 00:00:00 2001 From: Gregor Richards Date: Thu, 22 Sep 2016 17:36:46 -0400 Subject: [PATCH] Don't serialize frame 0 in netplay, as the core may not yet be ready --- network/netplay/netplay_net.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/network/netplay/netplay_net.c b/network/netplay/netplay_net.c index 7b4a6ade0a..6724b39aa5 100644 --- a/network/netplay/netplay_net.c +++ b/network/netplay/netplay_net.c @@ -59,7 +59,8 @@ static bool netplay_net_pre_frame(netplay_t *netplay) { retro_ctx_serialize_info_t serial_info; - if (netplay_delta_frame_ready(netplay, &netplay->buffer[netplay->self_ptr], netplay->self_frame_count)) + if (netplay_delta_frame_ready(netplay, &netplay->buffer[netplay->self_ptr], netplay->self_frame_count) && + netplay->self_frame_count > 0 /* Frame 0 may not yet be ready for serialization */) { serial_info.data_const = NULL; serial_info.data = netplay->buffer[netplay->self_ptr].state;