FIX(client): Debug

Hartmnt · Oct 15, 2024 · 57b1668 · 57b1668
1 parent cb01bfa
commit 57b1668
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/mumble/AudioWizard.cpp b/src/mumble/AudioWizard.cpp
@@ -49,10 +49,13 @@ AudioWizard::AudioWizard(QWidget *p) : QWizard(p) {
 			qcbInput->addItem(air->name);
 			if (air->name == AudioInputRegistrar::current) {
 				qcbInput->setCurrentIndex(qcbInput->count() - 1);
-				EchoCancelOptionID echoCancelOptionId = firstUsableEchoCancellation(air, qcbOutput->currentText());
-				if (echoCancelOptionId != EchoCancelOptionID::DISABLED) {
-					qcbEcho->setEnabled(true);
+				bool echoCancelPossible =
+					firstUsableEchoCancellation(air, qcbOutput->currentText()) != EchoCancelOptionID::DISABLED;
+				qcbEcho->setEnabled(echoCancelPossible);
+				if (echoCancelPossible) {
 					qcbEcho->setChecked(Global::get().s.echoOption != EchoCancelOptionID::DISABLED);
+				} else {
+					qcbEcho->setChecked(false);
 				}
 			}
 			QList< audioDevice > ql = air->getDeviceChoices();
@@ -769,7 +772,7 @@ void AudioWizard::on_qrbQualityCustom_clicked() {
 
 EchoCancelOptionID AudioWizard::firstUsableEchoCancellation(AudioInputRegistrar *air, const QString outputSys) {
 	for (EchoCancelOptionID ecoid : air->echoOptions) {
-		if (air->canEcho(ecoid, outputSys)) {
+		if (air->canEcho(ecoid, !outputSys.isEmpty() ? outputSys : Global::get().s.qsAudioOutput)) {
 			return ecoid;
 		}
 	}