Hide auto select button if there is only one device

jamulussoftware · Nov 4, 2021 · b4afc90 · b4afc90
1 parent 3861325
commit b4afc90
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/clientdlg.cpp b/src/clientdlg.cpp
@@ -1198,10 +1198,11 @@ void CClientDlg::Connect ( const QString& strSelectedAddress, const QString& str
         catch ( const CGenErr& generr )
         {
             // show error message and return the function
-            QMessageBox msgBox ( QMessageBox::Critical, APP_NAME, generr.GetErrorText(),
-                                 QMessageBox::NoButton, this );
+            QMessageBox  msgBox ( QMessageBox::Critical, APP_NAME, generr.GetErrorText(), QMessageBox::NoButton, this );
             QPushButton* openSettingsButton = msgBox.addButton ( tr ( "Open Settings" ), QMessageBox::ActionRole );
-            QPushButton* autoSelectButton = msgBox.addButton ( tr ( "Auto Select Device" ), QMessageBox::ActionRole );
+            // See also CClientSettingsDlg::UpdateSoundDeviceChannelSelectionFrame()
+            QPushButton* autoSelectButton =
+                ( pClient->GetSndCrdDevNames().count() > 1 ) ? msgBox.addButton ( tr ( "Auto Select Device" ), QMessageBox::ActionRole ) : nullptr;
             QPushButton* closeButton = msgBox.addButton ( tr ( "Close" ), QMessageBox::AcceptRole );
 
             msgBox.setTextFormat ( Qt::RichText ); // Some error messages are HTML formatted

diff --git a/src/clientsettingsdlg.cpp b/src/clientsettingsdlg.cpp
@@ -817,6 +817,9 @@ void CClientSettingsDlg::UpdateSoundDeviceChannelSelectionFrame()
     {
         cbxSoundcard->addItem ( strDevName );
     }
+    // Selecting devices automatically only makes sense if there is more than
+    // one to choose from.
+    butTryLoadAnyDriver->setVisible ( slSndCrdDevNames.count() > 1 );
 
     const QString& sSndCrdName = pClient->GetSndCrdDev();
     cbxSoundcard->setCurrentText ( sSndCrdName );