From b7c394b7a560787f13aad2a9111ea3a4842eb9b1 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Sat, 8 Jun 2019 12:04:04 +0200 Subject: [PATCH] Disable fading when volume control is disabled --- src/settings/backendsettingspage.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/settings/backendsettingspage.cpp b/src/settings/backendsettingspage.cpp index 5505560ef..b7d872edc 100644 --- a/src/settings/backendsettingspage.cpp +++ b/src/settings/backendsettingspage.cpp @@ -177,6 +177,7 @@ void BackendSettingsPage::ConnectSignals() { connect(ui_->checkbox_fadeout_stop, SIGNAL(toggled(bool)), SLOT(FadingOptionsChanged())); connect(ui_->checkbox_fadeout_cross, SIGNAL(toggled(bool)), SLOT(FadingOptionsChanged())); connect(ui_->checkbox_fadeout_auto, SIGNAL(toggled(bool)), SLOT(FadingOptionsChanged())); + connect(ui_->checkbox_volume_control, SIGNAL(toggled(bool)), SLOT(FadingOptionsChanged())); } @@ -609,7 +610,7 @@ void BackendSettingsPage::FadingOptionsChanged() { if (EngineInitialised()) { EngineBase::OutputDetails output = ui_->combobox_output->itemData(ui_->combobox_output->currentIndex()).value(); - if (engine()->type() == Engine::GStreamer && !(engine()->ALSADeviceSupport(output.name) && !ui_->lineedit_device->text().isEmpty())) { + if (engine()->type() == Engine::GStreamer && !(engine()->ALSADeviceSupport(output.name) && !ui_->lineedit_device->text().isEmpty()) && ui_->checkbox_volume_control->isChecked()) { ui_->groupbox_fading->setDisabled(false); } else {