changeset 1417:8bff263578ae 3.0-integration

Minor tidy
author Chris Cannam
date Mon, 12 Dec 2016 17:07:09 +0000
parents 130d167401b0
children 2dd0bc9f8fd4
files main/PreferencesDialog.cpp
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/main/PreferencesDialog.cpp	Mon Dec 12 17:01:51 2016 +0000
+++ b/main/PreferencesDialog.cpp	Mon Dec 12 17:07:09 2016 +0000
@@ -586,9 +586,6 @@
         implementationName = names[m_audioImplementation-1];
     }
 
-    m_audioPlaybackDeviceCombo->clear();
-    m_audioRecordDeviceCombo->clear();
-
     QString suffix;
     if (implementationName != "") {
         suffix = "-" + QString(implementationName.c_str());
@@ -597,6 +594,7 @@
     names = breakfastquay::AudioFactory::getPlaybackDeviceNames(implementationName);
     QString playbackDeviceName = settings.value
         ("audio-playback-device" + suffix, "").toString();
+    m_audioPlaybackDeviceCombo->clear();
     m_audioPlaybackDeviceCombo->addItem(tr("(auto)"));
     m_audioPlaybackDeviceCombo->setCurrentIndex(0);
     m_audioPlaybackDevice = 0;
@@ -611,6 +609,7 @@
     names = breakfastquay::AudioFactory::getRecordDeviceNames(implementationName);
     QString recordDeviceName = settings.value
         ("audio-record-device" + suffix, "").toString();
+    m_audioRecordDeviceCombo->clear();
     m_audioRecordDeviceCombo->addItem(tr("(auto)"));
     m_audioRecordDeviceCombo->setCurrentIndex(0);
     m_audioRecordDevice = 0;