From 1c5441aa40eb81e51682477921c02ad21cf57aa9 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Thu, 10 Oct 2019 00:07:25 +1000 Subject: [PATCH] AlsaSoundStream: Don't call join() on invalid thread This can happen if initialization failed. --- Source/Core/AudioCommon/AlsaSoundStream.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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()