Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #271 from AttorneyOnline/2.8.5-hotfix

Browse Source 
2.8.5 hotfixes
This commit is contained in:
oldmud0 2020-08-22 16:07:36 -05:00 committed by GitHub
commit 9f4487d9cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/aooptionsdialog.cpp
View File

@ -756,6 +756,9 @@ void AOOptionsDialog::save_pressed()
// Save everything into the config.ini. // Save everything into the config.ini.
QSettings *configini = ao_app->configini; 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("theme", ui_theme_combobox->currentText());
configini->setValue("log_goes_downwards", ui_downwards_cb->isChecked()); configini->setValue("log_goes_downwards", ui_downwards_cb->isChecked());
configini->setValue("log_maximum", ui_length_spinbox->value()); configini->setValue("log_maximum", ui_length_spinbox->value());
@ -806,7 +809,9 @@ void AOOptionsDialog::save_pressed()
configini->setValue("casing_can_host_cases", configini->setValue("casing_can_host_cases",
ui_casing_cm_cases_textbox->text()); ui_casing_cm_cases_textbox->text());
ao_app->initBASS(); if (audioChanged)
ao_app->initBASS();
callwordsini->close(); callwordsini->close();
done(0); done(0);
} }

3
src/courtroom.cpp
View File

@ -2660,7 +2660,8 @@ void Courtroom::append_ic_text(QString p_text, QString p_name, QString p_action,
// scroll to the bottom. // scroll to the bottom.
ui_ic_chatlog->moveCursor(log_goes_downwards ? QTextCursor::End : QTextCursor::Start); ui_ic_chatlog->moveCursor(log_goes_downwards ? QTextCursor::End : QTextCursor::Start);
ui_ic_chatlog->verticalScrollBar()->setValue( ui_ic_chatlog->verticalScrollBar()->setValue(
ui_ic_chatlog->verticalScrollBar()->maximum()); log_goes_downwards ? ui_ic_chatlog->verticalScrollBar()->maximum()
: 0);
} }
} }