Skip to content

Commit 487086e

Browse files
committed
unify code order some more
1 parent 6c5e313 commit 487086e

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Client/core/CSettings.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1376,11 +1376,11 @@ void CSettings::UpdateAudioTab()
13761376

13771377
CGameSettings* gameSettings = CCore::GetSingleton().GetGame()->GetSettings();
13781378

1379+
m_pAudioMasterVolume->SetScrollPosition(fMasterVolume);
13791380
m_pAudioRadioVolume->SetScrollPosition(m_fRadioVolume);
13801381
m_pAudioSFXVolume->SetScrollPosition(m_fSFXVolume);
13811382
m_pAudioMTAVolume->SetScrollPosition(fMTAVolume);
13821383
m_pAudioVoiceVolume->SetScrollPosition(fVoiceVolume);
1383-
m_pAudioMasterVolume->SetScrollPosition(fMasterVolume);
13841384

13851385
m_pCheckBoxAudioEqualizer->SetSelected(gameSettings->IsRadioEqualizerEnabled());
13861386
m_pCheckBoxAudioAutotune->SetSelected(gameSettings->IsRadioAutotuneEnabled());

Client/mods/deathmatch/logic/CClientGame.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3913,12 +3913,12 @@ void CClientGame::IdleHandler(void)
39133913
bool bMuteAll = g_pCore->GetCVars()->GetValue<bool>("mute_master_when_minimized");
39143914

39153915
// Apply mute on minimize options
3916-
if (bMuteAll || g_pCore->GetCVars()->GetValue<bool>("mute_sfx_when_minimized"))
3917-
g_pGame->GetAudio()->SetEffectsMasterVolume(0);
3918-
39193916
if (bMuteAll || g_pCore->GetCVars()->GetValue<bool>("mute_radio_when_minimized"))
39203917
g_pGame->GetAudio()->SetMusicMasterVolume(0);
39213918

3919+
if (bMuteAll || g_pCore->GetCVars()->GetValue<bool>("mute_sfx_when_minimized"))
3920+
g_pGame->GetAudio()->SetEffectsMasterVolume(0);
3921+
39223922
if (bMuteAll || g_pCore->GetCVars()->GetValue<bool>("mute_mta_when_minimized"))
39233923
m_pManager->GetSoundManager()->SetMinimizeMuted(true);
39243924
}

0 commit comments

Comments
 (0)