ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8397 from stenzek/fifoci-fix 

Fix FifoCI
This commit is contained in:
Connor McLaughlin 2019-10-10 00:27:31 +10:00 committed by GitHub
parent 6e613f4f82 7c286064b8
commit 6dbb5cc4ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/AudioCommon/AlsaSoundStream.cpp
View File

@ -25,6 +25,7 @@ AlsaSound::~AlsaSound()
// Give the opportunity to the audio thread // Give the opportunity to the audio thread
// to realize we are stopping the emulation // to realize we are stopping the emulation
cv.notify_one(); cv.notify_one();
if (thread.joinable())
thread.join(); thread.join();
} }

1
Source/Core/AudioCommon/AudioCommon.cpp
View File

@ -64,6 +64,7 @@ void InitSoundStream()
WARN_LOG(AUDIO, "Could not initialize backend %s, using %s instead.", backend.c_str(), WARN_LOG(AUDIO, "Could not initialize backend %s, using %s instead.", backend.c_str(),
BACKEND_NULLSOUND); BACKEND_NULLSOUND);
g_sound_stream = std::make_unique<NullSound>(); g_sound_stream = std::make_unique<NullSound>();
g_sound_stream->Init();
} }
UpdateSoundStream(); UpdateSoundStream();