From 05a110949ba41000983ff705340aea1caff81495 Mon Sep 17 00:00:00 2001
From: terencehill <piuntn@gmail.com>
Date: Wed, 20 Jul 2022 23:13:12 +0200
Subject: [PATCH] Fix #2718 "Online dedicated servers panic when gotomap is
 called during an intermission"

---
 qcsrc/server/intermission.qc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qcsrc/server/intermission.qc b/qcsrc/server/intermission.qc
index 98d2ef25b0..c1a5d33d8f 100644
--- a/qcsrc/server/intermission.qc
+++ b/qcsrc/server/intermission.qc
@@ -399,7 +399,8 @@ string GotoMap(string m)
 	if(!MapInfo_CheckMap(m))
 		return "The map you suggested does not support the current game mode.";
 	cvar_set("nextmap", m);
-	cvar_set("_endmatch", "1");
+	if (!intermission_running)
+		cvar_set("_endmatch", "1");
 	if(mapvote_initialized || alreadychangedlevel)
 	{
 		if(DoNextMapOverride(0))
-- 
2.39.2