Skip to content
Permalink
Browse files

Enable audio to be played during config restart query

The ConfigDialog::apply function also re-initializes
the audio input by stopping it at is beginning and
restarting it at the end. The modal restart query dialog
blocked this audio restart leaving the user with no
audio until the dialog was dismissed. This patch moves
the query until after the audio restart to resolve this.
  • Loading branch information...
hacst committed Jun 19, 2015
1 parent 6db171e commit a1ff21bd1fdc5745bd2a8e9474625f3f3811621b
Showing with 9 additions and 9 deletions.
  1. +9 −9 src/mumble/ConfigDialog.cpp
@@ -216,15 +216,6 @@ void ConfigDialog::apply() {
foreach(ConfigWidget *cw, qmWidgets)
cw->accept();

if (g.s.requireRestartToApply && QMessageBox::question(
this,
tr("Restart Mumble?"),
tr("Some settings will only apply after a restart of Mumble. Restart Mumble now?"),
QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {

qApp->exit(MUMBLE_EXIT_CODE_RESTART);
}

if (!g.s.bAttenuateOthersOnTalk)
g.bAttenuateOthers = false;

@@ -233,6 +224,15 @@ void ConfigDialog::apply() {
g.s.bExpert = qcbExpert->isChecked();

Audio::start();

if (g.s.requireRestartToApply && QMessageBox::question(
this,
tr("Restart Mumble?"),
tr("Some settings will only apply after a restart of Mumble. Restart Mumble now?"),
QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {

qApp->exit(MUMBLE_EXIT_CODE_RESTART);
}
}

void ConfigDialog::accept() {

0 comments on commit a1ff21b

Please sign in to comment.
You can’t perform that action at this time.