From 2179ae011302ecc48a2289a88cc865cdcb4d9f72 Mon Sep 17 00:00:00 2001 From: Choupom Date: Sun, 27 Mar 2011 12:12:50 +0200 Subject: fixed need restart warning in settings --- src/game/client/components/menus_settings.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/game/client') 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 -- cgit 1.4.1