From 5b0b118ee58d98270bbdd43b12ccb5de23533256 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Wed, 1 Feb 2023 23:16:48 +0000
Subject: [PATCH] M_SpecificMenuRestore: Fix a bug where setup_numplayers was
 always being set to 1, instead of only when "skipping" character select via
 netgame connection

---
 src/d_clisrv.c   | 4 ++++
 src/k_menufunc.c | 5 -----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 6acf77ddd..d3b756461 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -2516,6 +2516,10 @@ static void Command_connect(void)
 	// Menu restore state.
 	restoreMenu = &PLAY_MP_OptSelectDef;
 	S_ChangeMusicInternal("NETMD2", true);
+	if (setup_numplayers == 0)
+	{
+		setup_numplayers = 1;
+	}
 
 	CL_ConnectToServer();
 }
diff --git a/src/k_menufunc.c b/src/k_menufunc.c
index edd99b708..7fd1adc61 100644
--- a/src/k_menufunc.c
+++ b/src/k_menufunc.c
@@ -448,11 +448,6 @@ menu_t *M_SpecificMenuRestore(menu_t *torestore)
 		M_MPOptSelectInit(-1);
 	}
 
-	if (setup_numplayers == 0)
-	{
-		setup_numplayers = 1;
-	}
-
 	return torestore;
 }