From 6eaaaef995e9a7c2e6c9421132a9112d9610f29e Mon Sep 17 00:00:00 2001
From: Gregor Richards <hg-yff@gregor.im>
Date: Mon, 11 Sep 2017 19:17:50 -0400
Subject: [PATCH] Minor bugfixes in input resolution.

---
 network/netplay/netplay_frontend.c | 2 +-
 network/netplay/netplay_sync.c     | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/network/netplay/netplay_frontend.c b/network/netplay/netplay_frontend.c
index b0cf7b950f..2a1e4aa929 100644
--- a/network/netplay/netplay_frontend.c
+++ b/network/netplay/netplay_frontend.c
@@ -510,7 +510,7 @@ static int16_t netplay_input_state(netplay_t *netplay,
 
    delta = &netplay->buffer[ptr];
    istate = delta->resolved_input[port];
-   if (!istate)
+   if (!istate || !istate->used)
       return 0;
 
    curr_input_state = istate->data;
diff --git a/network/netplay/netplay_sync.c b/network/netplay/netplay_sync.c
index 4fd8a6de0b..9d349c72ed 100644
--- a/network/netplay/netplay_sync.c
+++ b/network/netplay/netplay_sync.c
@@ -355,7 +355,6 @@ bool netplay_resolve_input(netplay_t *netplay, size_t sim_ptr, bool resim)
                                      (1U<<RETRO_DEVICE_ID_JOYPAD_DOWN) |
                                      (1U<<RETRO_DEVICE_ID_JOYPAD_LEFT) |
                                      (1U<<RETRO_DEVICE_ID_JOYPAD_RIGHT);
-               uint32_t prev = simstate->data[0];
                simstate->data[0] &= keep;
                simstate->data[0] |= pstate->data[0] & ~keep;
             }