From 1cce5d8de2aaf6f77e997ec49245c3479b2af60f Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sat, 1 Feb 2020 13:07:58 +0100
Subject: [PATCH] - fixed RR was still generating input events when the game
 was paused.

---
 source/rr/src/game.cpp | 6 +++---
 source/rr/src/net.cpp  | 2 +-
 source/sw/src/game.cpp | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/source/rr/src/game.cpp b/source/rr/src/game.cpp
index 05907273b..16a33dcc7 100644
--- a/source/rr/src/game.cpp
+++ b/source/rr/src/game.cpp
@@ -1041,7 +1041,7 @@ void G_DrawRooms(int32_t playerNum, int32_t smoothRatio)
 
         if (RRRA && pPlayer->drug_mode > 0)
         {
-            while (pPlayer->drug_timer < totalclock && !(pPlayer->gm & MODE_MENU) && !ud.pause_on)
+            while (pPlayer->drug_timer < totalclock && !(pPlayer->gm & MODE_MENU) && !ud.pause_on && !GUICapture)
             {
                 int aspect;
                 if (pPlayer->drug_stat[0] == 0)
@@ -6001,7 +6001,7 @@ void G_HandleLocalKeys(void)
         }
     }
 
-    if (g_player[myconnectindex].ps->cheat_phase == 1 || (g_player[myconnectindex].ps->gm&(MODE_MENU|MODE_TYPE)))
+    if (g_player[myconnectindex].ps->cheat_phase == 1 || (g_player[myconnectindex].ps->gm&(MODE_MENU|MODE_TYPE)) || GUICapture)
         return;
 
     if (buttonMap.ButtonDown(gamefunc_See_Coop_View) && (GTFLAGS(GAMETYPE_COOPVIEW) || ud.recstat == 2))
@@ -7406,7 +7406,7 @@ MAIN_LOOP_RESTART:
 
 	            do
 	            {
-	                if (ready2send == 0) break;
+                    if (ready2send == 0) break;
 	                Net_GetInput();
 
 	                ototalclock += TICSPERFRAME;
diff --git a/source/rr/src/net.cpp b/source/rr/src/net.cpp
index 034174232..d6dfcb45f 100644
--- a/source/rr/src/net.cpp
+++ b/source/rr/src/net.cpp
@@ -1775,7 +1775,7 @@ void Net_GetInput(void)
     if (numplayers > 1)
         Net_GetPackets();
 
-    if (g_player[myconnectindex].movefifoend - movefifoplc >= 100)
+    if (g_player[myconnectindex].movefifoend - movefifoplc >= 100 || GUICapture)
         return;
 
     if (RRRA && g_player[myconnectindex].ps->on_motorcycle)
diff --git a/source/sw/src/game.cpp b/source/sw/src/game.cpp
index 3e69aed53..3c39401b0 100644
--- a/source/sw/src/game.cpp
+++ b/source/sw/src/game.cpp
@@ -2635,7 +2635,7 @@ void RunLevel(void)
 		faketimerhandler();
         if (LoadGameOutsideMoveLoop)
         {
-            return;
+            return; // Stop the game loop if a savegame was loaded from the menu.
         }
 
         if (M_Active())