From ab669a2db8ef1299b58fbb5ea122f136b7843f66 Mon Sep 17 00:00:00 2001
From: Gregor Richards <hg-yff@gregor.im>
Date: Wed, 13 Sep 2017 10:06:59 -0400
Subject: [PATCH] Fix a bug that could segfault with fast dis/reconnection.

---
 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 028ae12f80..9498efb8e1 100644
--- a/network/netplay/netplay_io.c
+++ b/network/netplay/netplay_io.c
@@ -1300,7 +1300,8 @@ static bool netplay_get_cmd(netplay_t *netplay,
                         if (!(devices & (1<<device))) continue;
                         netplay_input_state_t istate = netplay_input_state_for(
                               &dframe->real_input[device], client_num,
-                              3 /* FIXME */, true, false);
+                              3 /* FIXME */, false, false);
+                        if (!istate) continue;
                         memset(istate->data, 0, istate->size*sizeof(uint32_t));
                      }
                      dframe->have_local = true;