From 432090e2e9970d6c9eca33c83b5c5600f4b96c79 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Thu, 10 Sep 2020 21:01:04 +1200 Subject: [PATCH 1/3] Quiet warning for unused blendshapeCoefficients property --- libraries/entities/src/ModelEntityItem.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libraries/entities/src/ModelEntityItem.cpp b/libraries/entities/src/ModelEntityItem.cpp index 38e7ad9c3a..cd27c1cf36 100644 --- a/libraries/entities/src/ModelEntityItem.cpp +++ b/libraries/entities/src/ModelEntityItem.cpp @@ -746,6 +746,10 @@ QString ModelEntityItem::getBlendshapeCoefficients() const { } void ModelEntityItem::setBlendshapeCoefficients(const QString& blendshapeCoefficients) { + if (blendshapeCoefficients.isEmpty()) { + return; + } + QJsonParseError error; QJsonDocument newCoefficientsJSON = QJsonDocument::fromJson(blendshapeCoefficients.toUtf8(), &error); if (error.error != QJsonParseError::NoError) { From 932a3b9e915341e581bb1a04a7236ae46e52ce74 Mon Sep 17 00:00:00 2001 From: Kalila L Date: Mon, 14 Sep 2020 02:58:36 -0400 Subject: [PATCH 2/3] Update AudioClient.cpp Fix double locking attempt if waitForFinished causes prepareLocalAudioInjectors to be called on this thread. Co-Authored-By: Heather Anderson <1115056+odysseus654@users.noreply.github.com> --- libraries/audio-client/src/AudioClient.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp index 4e8c88560b..8d96a2e6b5 100644 --- a/libraries/audio-client/src/AudioClient.cpp +++ b/libraries/audio-client/src/AudioClient.cpp @@ -2072,7 +2072,6 @@ bool AudioClient::switchOutputToAudioDevice(const HifiAudioDeviceInfo outputDevi // NOTE: device start() uses the Qt internal device list Lock lock(_deviceMutex); - Lock localAudioLock(_localAudioMutex); _localSamplesAvailable.exchange(0, std::memory_order_release); //wait on local injectors prep to finish running @@ -2080,6 +2079,8 @@ bool AudioClient::switchOutputToAudioDevice(const HifiAudioDeviceInfo outputDevi _localPrepInjectorFuture.waitForFinished(); } + Lock localAudioLock(_localAudioMutex); + // cleanup any previously initialized device if (_audioOutput) { _audioOutputIODevice.close(); From d6a49439b8efc2b2ad3163ed6a1fc2a6832f4623 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Tue, 15 Sep 2020 15:57:34 +1200 Subject: [PATCH 3/3] Fix "Serverless" capitalization in title bar --- interface/src/Application.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index d86745a8b9..c02ac4ceb3 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -7110,9 +7110,9 @@ void Application::updateWindowTitle() const { QString currentPlaceName; if (isServerlessMode()) { if (isInErrorState) { - currentPlaceName = "serverless: " + nodeList->getDomainHandler().getErrorDomainURL().toString(); + currentPlaceName = "Serverless: " + nodeList->getDomainHandler().getErrorDomainURL().toString(); } else { - currentPlaceName = "serverless: " + DependencyManager::get()->getDomainURL().toString(); + currentPlaceName = "Serverless: " + DependencyManager::get()->getDomainURL().toString(); } } else { currentPlaceName = DependencyManager::get()->getDomainURL().host();