comparison main/PreferencesDialog.cpp @ 1415:13eb1d55f129 3.0-integration

Avoid overflowing vector if number of devices becomes smaller

     QString permishTag = QString("network-permission-%1").arg(SV_VERSION);
     settings.setValue(permishTag, m_networkPermission);
 
     vector<string> names = breakfastquay::AudioFactory::getImplementationNames();
     string implementationName;
+    if (m_audioImplementation > int(names.size())) {
+        m_audioImplementation = 0;
+    }
     if (m_audioImplementation > 0) {
         implementationName = names[m_audioImplementation-1];
     }
     settings.setValue("audio-target", implementationName.c_str());
 

         suffix = "-" + QString(implementationName.c_str());
     }
     
     names = breakfastquay::AudioFactory::getPlaybackDeviceNames(implementationName);
     string deviceName;
+    if (m_audioPlaybackDevice > int(names.size())) {
+        m_audioPlaybackDevice = 0;
+    }
     if (m_audioPlaybackDevice > 0) {
         deviceName = names[m_audioPlaybackDevice-1];
     }
     settings.setValue("audio-playback-device" + suffix, deviceName.c_str());
 
     names = breakfastquay::AudioFactory::getRecordDeviceNames(implementationName);
     deviceName = "";
+    if (m_audioRecordDevice > int(names.size())) {
+        m_audioRecordDevice = 0;
+    }
     if (m_audioRecordDevice > 0) {
         deviceName = names[m_audioRecordDevice-1];
     }
     settings.setValue("audio-record-device" + suffix, deviceName.c_str());
     

         m_changesOnRestart = false;
     }
 
     if (m_audioDeviceChanged) {
         emit audioDeviceChanged();
+        m_audioDeviceChanged = false;
     }
 }    
 
 void
 PreferencesDialog::cancelClicked()