From: LegendaryGuard <rootuser999@gmail.com>
Date: Thu, 21 Jul 2022 14:09:13 +0000 (+0000)
Subject: Merge branch 'terencehill/gotomap_fix' into 'master'
X-Git-Tag: xonotic-v0.8.6~412
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=1addf834762cdee847e12c45a190c1e762ace057;hp=3c3ce4f2a770de75f91558eec5d14d112684899a;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/gotomap_fix' into 'master'

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

Closes #2718

See merge request xonotic/xonotic-data.pk3dir!1055
---

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))