From f6f9905ae3b0f31c3e9721712b7c1babbb62b379 Mon Sep 17 00:00:00 2001
From: Gregor Richards <hg-yff@gregor.im>
Date: Mon, 12 Dec 2016 19:50:08 -0500
Subject: [PATCH] Made remote pausing connection-specific

---
 network/netplay/netplay.c         | 23 +++++++++++++++++++++++
 network/netplay/netplay_private.h |  3 +++
 2 files changed, 26 insertions(+)

diff --git a/network/netplay/netplay.c b/network/netplay/netplay.c
index 2240d71298..7ab205090a 100644
--- a/network/netplay/netplay.c
+++ b/network/netplay/netplay.c
@@ -1239,12 +1239,29 @@ static bool netplay_get_cmd(netplay_t *netplay,
          }
 
       case NETPLAY_CMD_PAUSE:
+         connection->paused = true;
          netplay->remote_paused = true;
+         netplay_send_raw_cmd_all(netplay, connection, NETPLAY_CMD_PAUSE, NULL, 0);
          break;
 
       case NETPLAY_CMD_RESUME:
+      {
+         size_t i;
+         connection->paused = false;
          netplay->remote_paused = false;
+         for (i = 0; i < netplay->connections_size; i++)
+         {
+            struct netplay_connection *sc = &netplay->connections[i];
+            if (sc->active && sc->paused)
+            {
+               netplay->remote_paused = true;
+               break;
+            }
+         }
+         if (!netplay->remote_paused && !netplay->local_paused)
+            netplay_send_raw_cmd_all(netplay, connection, NETPLAY_CMD_RESUME, NULL, 0);
          break;
+      }
 
       default:
          RARCH_ERR("%s.\n", msg_hash_to_str(MSG_UNKNOWN_NETPLAY_COMMAND_RECEIVED));
@@ -2201,6 +2218,12 @@ void netplay_frontend_paused(netplay_t *netplay, bool paused)
       return;
 
    netplay->local_paused = paused;
+
+   /* If other connections are paused, nothing to say */
+   if (netplay->remote_paused)
+      return;
+
+   /* Have to send manually because every buffer must be flushed immediately */
    for (i = 0; i < netplay->connections_size; i++)
    {
       struct netplay_connection *connection = &netplay->connections[i];
diff --git a/network/netplay/netplay_private.h b/network/netplay/netplay_private.h
index afbc170214..c363745f8f 100644
--- a/network/netplay/netplay_private.h
+++ b/network/netplay/netplay_private.h
@@ -249,6 +249,9 @@ struct netplay_connection
 
    /* Player # of connected player */
    int player;
+
+   /* Is this player paused? */
+   bool paused;
 };
 
 struct netplay