Merge branch 'master' into i18n

2 files changed, 8 insertions, 6 deletions

diff --git a/scripts/configure_ubuntu.sh b/scripts/configure_ubuntu.sh
index 1f9b8e83..6cad1f15 100755
--- a/scripts/configure_ubuntu.sh
+++ b/scripts/configure_ubuntu.sh
@@ -11,7 +11,8 @@ cd ${ROOT_DIR}
 
 #need some openGL stuff
 sudo apt install libgl1-mesa-dev
-
+#install curl incase of fresh vm
+sudo apt install curl
 mkdir tmp
 
 cd tmp
diff --git a/src/aooptionsdialog.cpp b/src/aooptionsdialog.cpp
index 0f6a054a..4bfe9de2 100644
--- a/src/aooptionsdialog.cpp
+++ b/src/aooptionsdialog.cpp
@@ -199,7 +199,6 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) : QDi
     ui_callwords_layout->addWidget(ui_callwords_explain_lbl);
 
     // The audio tab.
-    #ifdef BASSAUDIO
     ui_audio_tab = new QWidget();
     ui_settings_tabs->addTab(ui_audio_tab, tr("Audio"));
 
@@ -221,20 +220,23 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) : QDi
 
     // Let's fill out the combobox with the available audio devices. Or don't if there is no audio
     int a = 0;
+    #ifdef BASSAUDIO
     BASS_DEVICEINFO info;
-
+    #endif
     if (needs_default_audiodev())
     {
+
         ui_audio_device_combobox->addItem("default");
-    }
 
+    }
+    #ifdef BASSAUDIO
     for (a = 0; BASS_GetDeviceInfo(a, &info); a++)
     {
         ui_audio_device_combobox->addItem(info.name);
         if (p_ao_app->get_audio_output_device() == info.name)
             ui_audio_device_combobox->setCurrentIndex(ui_audio_device_combobox->count()-1);
     }
-
+    #endif
     ui_audio_layout->setWidget(0, QFormLayout::FieldRole, ui_audio_device_combobox);
 
     ui_audio_volume_divider = new QFrame(ui_audio_widget);
@@ -312,7 +314,6 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) : QDi
     ui_blank_blips_cb->setChecked(p_ao_app->get_blank_blip());
 
     ui_audio_layout->setWidget(7, QFormLayout::FieldRole, ui_blank_blips_cb);
-    #endif
 
     // The casing tab!
     ui_casing_tab = new QWidget();