summaryrefslogtreecommitdiff
path: root/Source/Core/AudioCommon/AudioCommon.cpp
diff options
context:
space:
mode:
authorMarkus Wick <degasus@users.noreply.github.com>2017-04-21 10:29:21 +0200
committerGitHub <noreply@github.com>2017-04-21 10:29:21 +0200
commit50349098c192e0ff05eed452a26640fb1a71ae3e (patch)
tree23df50defb0a466ca5dcf736a5ccef1cae5917c2 /Source/Core/AudioCommon/AudioCommon.cpp
parent4517231a1af9a683131806354a82d205a42ba0e3 (diff)
parentc538cdcd47fa04cd087f3538cc916c3025bcb62a (diff)
Merge pull request #5292 from ligfx/setvolumeafterstart
AudioCommon: set volume _after_ starting stream
Diffstat (limited to 'Source/Core/AudioCommon/AudioCommon.cpp')
-rw-r--r--Source/Core/AudioCommon/AudioCommon.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/AudioCommon/AudioCommon.cpp b/Source/Core/AudioCommon/AudioCommon.cpp
index 59f62d7cd9..fea933e582 100644
--- a/Source/Core/AudioCommon/AudioCommon.cpp
+++ b/Source/Core/AudioCommon/AudioCommon.cpp
@@ -57,8 +57,6 @@ void InitSoundStream()
g_sound_stream = std::make_unique<NullSound>();
}
- UpdateSoundStream();
-
if (!g_sound_stream->Start())
{
ERROR_LOG(AUDIO, "Could not start backend %s, using %s instead", backend.c_str(),
@@ -68,6 +66,8 @@ void InitSoundStream()
g_sound_stream->Start();
}
+ UpdateSoundStream();
+
if (SConfig::GetInstance().m_DumpAudio && !s_audio_dump_start)
StartAudioDump();
}