Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-29 10:39:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #12586 from kencooke/audio-peakmeters-fix

Browse source 
Fix crash when closing the Audio menu
This commit is contained in:
Ken Cooke 2018-03-13 07:52:37 -07:00 committed by GitHub
commit bcf893db18
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libraries/audio-client/src/AudioPeakValues.cpp
View file

@ -43,14 +43,19 @@ void AudioClient::checkPeakValues() {
// prepare the windows environment // prepare the windows environment
CoInitialize(NULL); CoInitialize(NULL);
std::unique_lock<std::mutex> lock(_deviceMutex, std::defer_lock);
// if disabled, clean up active clients // if disabled, clean up active clients
if (!_enablePeakValues) { if (!_enablePeakValues) {
activeClients.clear(); if (lock.try_lock()) {
// deferred, if timer callbacks overlap
activeClients.clear();
}
return; return;
} }
// lock the devices so the _inputDevices list is static // lock the devices so the _inputDevices list is static
std::unique_lock<std::mutex> lock(_deviceMutex); lock.lock();
HRESULT result; HRESULT result;
// initialize the payload // initialize the payload