From 777f1675fcf4a2d50e159c00277c9683388d2a43 Mon Sep 17 00:00:00 2001
From: wolfy852 <wolfy852@hotmail.com>
Date: Tue, 7 May 2019 02:06:59 -0500
Subject: [PATCH] Correct a merge mistake

---
 src/d_netcmd.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index d5258646d..e824e0721 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -2325,7 +2325,8 @@ static void Command_Map_f(void)
 		; // The player wants us to trek on anyway.  Do so.
 	// G_TOLFlag handles both multiplayer gametype and ignores it for !multiplayer
 	// Alternatively, bail if the map header is completely missing anyway.
-	else
+	else if (!mapheaderinfo[newmapnum-1]
+	 || !(mapheaderinfo[newmapnum-1]->typeoflevel & G_TOLFlag(newgametype)))
 	{
 		char gametypestring[32] = "Single Player";
 
-- 
GitLab