Merge pull request #271 from AttorneyOnline/2.8.5-hotfix

2.8.5 hotfixes

2 files changed, 8 insertions, 2 deletions

diff --git a/src/aooptionsdialog.cpp b/src/aooptionsdialog.cpp
index 6fc4d03e..4d36f43f 100644
--- a/src/aooptionsdialog.cpp
+++ b/src/aooptionsdialog.cpp
@@ -756,6 +756,9 @@ void AOOptionsDialog::save_pressed()
   // Save everything into the config.ini.
   QSettings *configini = ao_app->configini;
 
+  const bool audioChanged = ui_audio_device_combobox->currentText() !=
+      ao_app->get_audio_output_device();
+
   configini->setValue("theme", ui_theme_combobox->currentText());
   configini->setValue("log_goes_downwards", ui_downwards_cb->isChecked());
   configini->setValue("log_maximum", ui_length_spinbox->value());
@@ -806,7 +809,9 @@ void AOOptionsDialog::save_pressed()
   configini->setValue("casing_can_host_cases",
                       ui_casing_cm_cases_textbox->text());
 
-  ao_app->initBASS();
+  if (audioChanged)
+    ao_app->initBASS();
+
   callwordsini->close();
   done(0);
 }
diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index 2484bcb0..04c625fe 100644
--- a/src/courtroom.cpp
+++ b/src/courtroom.cpp
@@ -2660,7 +2660,8 @@ void Courtroom::append_ic_text(QString p_text, QString p_name, QString p_action,
     // scroll to the bottom.
     ui_ic_chatlog->moveCursor(log_goes_downwards ? QTextCursor::End : QTextCursor::Start);
     ui_ic_chatlog->verticalScrollBar()->setValue(
-        ui_ic_chatlog->verticalScrollBar()->maximum());
+        log_goes_downwards ? ui_ic_chatlog->verticalScrollBar()->maximum()
+                           : 0);
   }
 }