From: Holger Schemel <info@artsoft.org>
Date: Mon, 1 Oct 2018 20:05:11 +0000 (+0200)
Subject: added waiting for key or button after starting or stopping network mode
X-Git-Tag: 4.1.1.0~15
X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=commitdiff_plain;h=6e9813476a7d45f1f6fba23357e10b3aff33c0c2

added waiting for key or button after starting or stopping network mode
---

diff --git a/src/init.c b/src/init.c
index a2eb5772..a7657670 100644
--- a/src/init.c
+++ b/src/init.c
@@ -5684,7 +5684,8 @@ void InitNetworkServer(void)
   }
 
   /* short time to recognize result of network initialization */
-  Delay_WithScreenUpdates(1000);
+  if (game_status == GAME_MODE_LOADING)
+    Delay_WithScreenUpdates(1000);
 }
 
 static boolean CheckArtworkConfigForCustomElements(char *filename)
diff --git a/src/network.c b/src/network.c
index 1b9a1386..e1bce45a 100644
--- a/src/network.c
+++ b/src/network.c
@@ -1059,7 +1059,4 @@ void DisconnectFromNetworkServer(void)
   HandleNetworkingDisconnect();
 
   DrawNetworkText_Success("Successfully disconnected!");
-
-  /* short time to recognize result of network initialization */
-  Delay_WithScreenUpdates(1000);
 }
diff --git a/src/screens.c b/src/screens.c
index 4967ebde..43198fa8 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -5980,6 +5980,8 @@ static void ToggleNetworkModeIfNeeded(void)
   DrawTextSCentered(ybottom, font_foot,
 		    "Press any key or button for setup menu");
 
+  WaitForEventToContinue();
+
   DrawSetupScreen();
 }