From 7ab76984ad8f08900fd27c63f20f0c3e60dbca84 Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Mon, 10 Oct 2016 16:54:08 -0700 Subject: [PATCH 1/2] Fix crash when switching to desktop mode from oculus HMD mode Removed internalPresent in oculus uncustomizeContext. It had no ill effects. --- plugins/oculus/src/OculusBaseDisplayPlugin.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/oculus/src/OculusBaseDisplayPlugin.cpp b/plugins/oculus/src/OculusBaseDisplayPlugin.cpp index 83da154b1f..377050064a 100644 --- a/plugins/oculus/src/OculusBaseDisplayPlugin.cpp +++ b/plugins/oculus/src/OculusBaseDisplayPlugin.cpp @@ -63,7 +63,6 @@ void OculusBaseDisplayPlugin::customizeContext() { void OculusBaseDisplayPlugin::uncustomizeContext() { Parent::uncustomizeContext(); - internalPresent(); } bool OculusBaseDisplayPlugin::internalActivate() { From 350977f03e77ca73043e24159d20893acd53de60 Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Tue, 11 Oct 2016 10:49:43 -0700 Subject: [PATCH 2/2] Speculative fix for crash in AudioClient --- libraries/audio-client/src/AudioClient.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp index 6fbd93e386..5fced85d2d 100644 --- a/libraries/audio-client/src/AudioClient.cpp +++ b/libraries/audio-client/src/AudioClient.cpp @@ -867,6 +867,10 @@ void AudioClient::handleLocalEchoAndReverb(QByteArray& inputByteArray) { void AudioClient::handleAudioInput() { + if (!_inputDevice) { + return; + } + // input samples required to produce exactly NETWORK_FRAME_SAMPLES of output const int inputSamplesRequired = (_inputToNetworkResampler ? _inputToNetworkResampler->getMinInput(AudioConstants::NETWORK_FRAME_SAMPLES_PER_CHANNEL) :