fix(avform): Fixed empty value in audio and video lists

qTox · Oct 8, 2016 · 15181c4 · 15181c4
1 parent f5f7b5a
commit 15181c4
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/widget/form/settings/avform.cpp b/src/widget/form/settings/avform.cpp
@@ -456,11 +456,11 @@ void AVForm::getAudioInDevices()
     inDevCombobox->blockSignals(false);
 
     int idx = 0;
-    if (Settings::getInstance().getAudioInDevEnabled() && deviceNames.size() > 1)
+    bool enabled = Settings::getInstance().getAudioInDevEnabled();
+    if (enabled && deviceNames.size() > 1)
     {
-        idx = deviceNames.indexOf(Settings::getInstance().getInDev()) + 1;
-        if (idx <= 0)
-            idx = 1;
+        QString dev = Settings::getInstance().getInDev();
+        idx = qMax(deviceNames.indexOf(dev), 1);
     }
     inDevCombobox->setCurrentIndex(idx);
 }
@@ -476,11 +476,11 @@ void AVForm::getAudioOutDevices()
     outDevCombobox->blockSignals(false);
 
     int idx = 0;
-    if (Settings::getInstance().getAudioOutDevEnabled() && deviceNames.size() > 1)
+    bool enabled = Settings::getInstance().getAudioOutDevEnabled();
+    if (enabled && deviceNames.size() > 1)
     {
-        idx = deviceNames.indexOf(Settings::getInstance().getOutDev()) + 1;
-        if (idx <= 0)
-            idx = 1;
+        QString dev = Settings::getInstance().getOutDev();
+        idx = qMax(deviceNames.indexOf(dev), 1);
     }
     outDevCombobox->setCurrentIndex(idx);
 }