From: Rudolf Polzer <divverent@alientrap.org>
Date: Wed, 19 Jan 2011 20:29:48 +0000 (+0100)
Subject: fix for menu music playing when restarting the menu
X-Git-Tag: xonotic-v0.5.0~316^2~56^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6d1c5d967d027c92815bba88fa8cc3ca77f84615;p=xonotic%2Fxonotic-data.pk3dir.git

fix for menu music playing when restarting the menu
---

diff --git a/qcsrc/menu/menu.qc b/qcsrc/menu/menu.qc
index 71cc021b5..4f0283c93 100644
--- a/qcsrc/menu/menu.qc
+++ b/qcsrc/menu/menu.qc
@@ -561,9 +561,11 @@ void() m_draw =
 		if(Menu_Active)
 		if(!cvar("menu_video_played"))
 		{
-			localcmd("set menu_video_played 1; cd loop $menu_cdtrack; play sound/announcer/default/welcome.ogg\n");
+			localcmd("cd loop $menu_cdtrack; play sound/announcer/default/welcome.ogg\n");
 			menuLogoAlpha = -0.8; // no idea why, but when I start this at zero, it jumps instead of fading FIXME
 		}
+		// ALWAYS set this cvar; if we start but menu is not active, this means we want no background music!
+		localcmd("set menu_video_played 1\n");
 	}
 
 	t = gettime();