Fixed an issue falling back to an incompatible audio device configura…

…tion after a disconnection
juce-framework · Dec 5, 2018 · d81ce3c · d81ce3c
1 parent cdff2c7
commit d81ce3c
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.cpp b/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.cpp
@@ -140,13 +140,20 @@ void AudioDeviceManager::audioDeviceListChanged()
             closeAudioDevice();
 
             std::unique_ptr<XmlElement> e (createStateXml());
-            initialiseFromXML (*e, true, preferredDeviceName, &currentSetup);
+
+            if (e == nullptr)
+                initialiseDefault (preferredDeviceName, &currentSetup);
+            else
+                initialiseFromXML (*e, true, preferredDeviceName, &currentSetup);
         }
 
-        currentSetup.sampleRate     = currentAudioDevice->getCurrentSampleRate();
-        currentSetup.bufferSize     = currentAudioDevice->getCurrentBufferSizeSamples();
-        currentSetup.inputChannels  = currentAudioDevice->getActiveInputChannels();
-        currentSetup.outputChannels = currentAudioDevice->getActiveOutputChannels();
+        if (currentAudioDevice != nullptr)
+        {
+            currentSetup.sampleRate     = currentAudioDevice->getCurrentSampleRate();
+            currentSetup.bufferSize     = currentAudioDevice->getCurrentBufferSizeSamples();
+            currentSetup.inputChannels  = currentAudioDevice->getActiveInputChannels();
+            currentSetup.outputChannels = currentAudioDevice->getActiveOutputChannels();
+        }
     }
 
     sendChangeMessage();