about summary refs log tree commit diff
path: root/src/game/client/components/menus_settings.cpp
diff options
context:
space:
mode:
authoroy <Tom_Adams@web.de>2011-06-27 23:26:01 +0200
committeroy <Tom_Adams@web.de>2011-06-27 23:26:01 +0200
commitfdf6db5fd6ba56cc4cb1993b0ca8153a890c769f (patch)
tree1c133fc53f26540fc316511335e0bf56b9fa77d7 /src/game/client/components/menus_settings.cpp
parent47cdd2524b4d5bff7f171686af8260aa8a083c50 (diff)
downloadzcatch-fdf6db5fd6ba56cc4cb1993b0ca8153a890c769f.tar.gz
zcatch-fdf6db5fd6ba56cc4cb1993b0ca8153a890c769f.zip
fixed that music resets on password prompt. Closes #695
Diffstat (limited to 'src/game/client/components/menus_settings.cpp')
-rw-r--r--src/game/client/components/menus_settings.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/game/client/components/menus_settings.cpp b/src/game/client/components/menus_settings.cpp
index 0a26a087..82d3f652 100644
--- a/src/game/client/components/menus_settings.cpp
+++ b/src/game/client/components/menus_settings.cpp
@@ -759,7 +759,10 @@ void CMenus::RenderSettingsSound(CUIRect MainView)
 	{
 		g_Config.m_SndEnable ^= 1;
 		if(g_Config.m_SndEnable)
-			m_pClient->m_pSounds->Play(CSounds::CHN_MUSIC, SOUND_MENU, 1.0f, vec2(0, 0));
+		{
+			if(g_Config.m_SndMusic)
+				m_pClient->m_pSounds->Play(CSounds::CHN_MUSIC, SOUND_MENU, 1.0f, vec2(0, 0));
+		}
 		else
 			m_pClient->m_pSounds->Stop(SOUND_MENU);
 		m_NeedRestartSound = g_Config.m_SndEnable && (!s_SndEnable || s_SndRate != g_Config.m_SndRate);