From ec5bc5655dd8e393779612a8ca8f2c464716c060 Mon Sep 17 00:00:00 2001
From: jules <jules@rawmaterialsoftware.com>
Date: Fri, 26 Oct 2007 12:47:45 +0000
Subject: [PATCH]

---
 src/juce_appframework/audio/devices/juce_AudioDeviceManager.cpp | 1 +
 .../components/special/juce_AudioDeviceSelectorComponent.cpp    | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/juce_appframework/audio/devices/juce_AudioDeviceManager.cpp b/src/juce_appframework/audio/devices/juce_AudioDeviceManager.cpp
index fa7a6c170f..edef0dd6d6 100644
--- a/src/juce_appframework/audio/devices/juce_AudioDeviceManager.cpp
+++ b/src/juce_appframework/audio/devices/juce_AudioDeviceManager.cpp
@@ -63,6 +63,7 @@ AudioDeviceManager::~AudioDeviceManager()
 {
     stopDevice();
     deleteAndZero (currentAudioDevice);
+    deleteAndZero (defaultMidiOutput);
     delete lastExplicitSettings;
 }
 
diff --git a/src/juce_appframework/gui/components/special/juce_AudioDeviceSelectorComponent.cpp b/src/juce_appframework/gui/components/special/juce_AudioDeviceSelectorComponent.cpp
index d746d655a3..b35599853c 100644
--- a/src/juce_appframework/gui/components/special/juce_AudioDeviceSelectorComponent.cpp
+++ b/src/juce_appframework/gui/components/special/juce_AudioDeviceSelectorComponent.cpp
@@ -478,6 +478,8 @@ void AudioDeviceSelectorComponent::changeListenerCallback (void*)
 
     if (currentDevice != 0)
     {
+        audioDeviceDropDown->setText (currentDevice->getName(), true);
+
         // sample rate
         addAndMakeVisible (sampleRateDropDown = new ComboBox ("samplerate"));
         sampleRateLabel = new Label ("l2", TRANS ("sample rate:"));