summaryrefslogtreecommitdiff
path: root/Source/Core/AudioCommon/AlsaSoundStream.cpp
diff options
context:
space:
mode:
authorConnor McLaughlin <stenzek@gmail.com>2019-10-10 00:27:31 +1000
committerGitHub <noreply@github.com>2019-10-10 00:27:31 +1000
commit6dbb5cc4eab19733cb78d809ba7ca597f80a327b (patch)
tree44a309ccce71189e4d163b80e103e1c110491898 /Source/Core/AudioCommon/AlsaSoundStream.cpp
parent6e613f4f82085edac10587562849c79ec5d342a0 (diff)
parent7c286064b85edeb9a53916fbd2add76ef60bc5a5 (diff)
Merge pull request #8397 from stenzek/fifoci-fix
Fix FifoCI
Diffstat (limited to 'Source/Core/AudioCommon/AlsaSoundStream.cpp')
-rw-r--r--Source/Core/AudioCommon/AlsaSoundStream.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/Core/AudioCommon/AlsaSoundStream.cpp b/Source/Core/AudioCommon/AlsaSoundStream.cpp
index d249640d1b..44f47400d9 100644
--- a/Source/Core/AudioCommon/AlsaSoundStream.cpp
+++ b/Source/Core/AudioCommon/AlsaSoundStream.cpp
@@ -25,7 +25,8 @@ AlsaSound::~AlsaSound()
// Give the opportunity to the audio thread
// to realize we are stopping the emulation
cv.notify_one();
- thread.join();
+ if (thread.joinable())
+ thread.join();
}
bool AlsaSound::Init()