about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorChoupom <andycootlapin@hotmail.fr>2011-03-27 12:12:50 +0200
committeroy <Tom_Adams@web.de>2011-04-13 17:49:31 +0200
commit2179ae011302ecc48a2289a88cc865cdcb4d9f72 (patch)
tree67867208abae6cac0ac2ad0c148bae670693cc14 /src
parent876eac10484c4f4a29a64126ad2be5866baaf687 (diff)
downloadzcatch-2179ae011302ecc48a2289a88cc865cdcb4d9f72.tar.gz
zcatch-2179ae011302ecc48a2289a88cc865cdcb4d9f72.zip
fixed need restart warning in settings
Diffstat (limited to 'src')
-rw-r--r--src/game/client/components/menus_settings.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/game/client/components/menus_settings.cpp b/src/game/client/components/menus_settings.cpp
index ac5a5f40..688f7695 100644
--- a/src/game/client/components/menus_settings.cpp
+++ b/src/game/client/components/menus_settings.cpp
@@ -755,7 +755,7 @@ void CMenus::RenderSettingsSound(CUIRect MainView)
 	if(DoButton_CheckBox(&g_Config.m_SndEnable, Localize("Use sounds"), g_Config.m_SndEnable, &Button))
 	{
 		g_Config.m_SndEnable ^= 1;
-		m_NeedRestartSound = s_SndEnable == g_Config.m_SndEnable && (!s_SndEnable || s_SndRate == g_Config.m_SndRate) ? false : true;
+		m_NeedRestartSound = g_Config.m_SndEnable && (!s_SndEnable || s_SndRate != g_Config.m_SndRate);
 	}
 
 	if(!g_Config.m_SndEnable)
@@ -774,11 +774,8 @@ void CMenus::RenderSettingsSound(CUIRect MainView)
 		Button.VSplitLeft(190.0f, 0, &Button);
 		static float Offset = 0.0f;
 		DoEditBox(&g_Config.m_SndRate, &Button, aBuf, sizeof(aBuf), 14.0f, &Offset);
-		int Before = g_Config.m_SndRate;
 		g_Config.m_SndRate = max(1, str_toint(aBuf));
-
-		if(g_Config.m_SndRate != Before)
-			m_NeedRestartSound = s_SndEnable == g_Config.m_SndEnable && s_SndRate == g_Config.m_SndRate ? false : true;
+		m_NeedRestartSound = !s_SndEnable || s_SndRate != g_Config.m_SndRate;
 	}
 
 	// volume slider