From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 25 Feb 2012 18:35:57 +0000 (+0100)
Subject: fix a possible endless loop if server.cfg sets samelevel to 1
X-Git-Tag: xonotic-v0.6.0~42^2~12
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9655644f8a80b16d9cccefb39307f9f2035c37cd;p=xonotic%2Fxonotic-data.pk3dir.git

fix a possible endless loop if server.cfg sets samelevel to 1
---

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 289f07fa7..1527f88ee 100644
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -1251,7 +1251,7 @@ float DoNextMapOverride(float reinit)
 		alreadychangedlevel = TRUE;
 		return TRUE;
 	}
-	if (autocvar_samelevel) // if samelevel is set, stay on same level
+	if (!reinit && autocvar_samelevel) // if samelevel is set, stay on same level
 	{
 		localcmd("restart\n");
 		alreadychangedlevel = TRUE;