From: terencehill <piuntn@gmail.com>
Date: Wed, 20 Jul 2022 21:13:12 +0000 (+0200)
Subject: Fix #2718 "Online dedicated servers panic when gotomap is called during an intermission"
X-Git-Tag: xonotic-v0.8.6~412^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=05a110949ba41000983ff705340aea1caff81495;p=xonotic%2Fxonotic-data.pk3dir.git

Fix #2718 "Online dedicated servers panic when gotomap is called during an intermission"
---

diff --git a/qcsrc/server/intermission.qc b/qcsrc/server/intermission.qc
index 98d2ef25b..c1a5d33d8 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))