From 1218f7e01404e25659821d45199087b9db3789d4 Mon Sep 17 00:00:00 2001 From: amer cerkic Date: Thu, 20 Jun 2019 15:10:21 -0700 Subject: [PATCH 1/2] moved audioclient stop to dtor --- interface/src/Application.cpp | 1 - libraries/audio-client/src/AudioClient.cpp | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index f9470782bf..21ffd51dd4 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -2775,7 +2775,6 @@ void Application::cleanupBeforeQuit() { // destroy Audio so it and its threads have a chance to go down safely // this must happen after QML, as there are unexplained audio crashes originating in qtwebengine - QMetaObject::invokeMethod(DependencyManager::get().data(), "stop"); DependencyManager::destroy(); DependencyManager::destroy(); diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp index 41396811f0..11d3e18853 100644 --- a/libraries/audio-client/src/AudioClient.cpp +++ b/libraries/audio-client/src/AudioClient.cpp @@ -1,4 +1,4 @@ -// +tttttt// // AudioClient.cpp // interface/src // @@ -375,6 +375,9 @@ AudioClient::AudioClient() : } AudioClient::~AudioClient() { + + stop(); + if (_codec && _encoder) { _codec->releaseEncoder(_encoder); _encoder = nullptr; From 30e295d1a0231c63a05c7013b0884f8493103a57 Mon Sep 17 00:00:00 2001 From: amer cerkic Date: Thu, 20 Jun 2019 15:12:20 -0700 Subject: [PATCH 2/2] push to talk causes fun, removing tttt --- libraries/audio-client/src/AudioClient.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp index 11d3e18853..04ab0f7973 100644 --- a/libraries/audio-client/src/AudioClient.cpp +++ b/libraries/audio-client/src/AudioClient.cpp @@ -1,4 +1,4 @@ -tttttt// +// // AudioClient.cpp // interface/src //