output/wasapi: use default device only if none was configured

1 files changed, 5 insertions, 6 deletions

diff --git a/src/output/plugins/wasapi/WasapiOutputPlugin.cxx b/src/output/plugins/wasapi/WasapiOutputPlugin.cxx
index 4c306989e..5c234db56 100644
--- a/src/output/plugins/wasapi/WasapiOutputPlugin.cxx
+++ b/src/output/plugins/wasapi/WasapiOutputPlugin.cxx
@@ -617,14 +617,13 @@ void WasapiOutput::OpenDevice() {
 	if (!device_config.empty()) {
 		if (!SafeSilenceTry([this, &id]() { id = std::stoul(device_config); })) {
 			id = SearchDevice(device_config);
+			if (id == kErrorId)
+				throw FormatRuntimeError("Device '%s' not found",
+							 device_config.c_str());
 		}
-	}
-
-	if (id != kErrorId) {
-		SafeTry([this, id]() { GetDevice(id); });
-	}
 
-	if (!device) {
+		GetDevice(id);
+	} else {
 		device = GetDefaultAudioEndpoint(*enumerator);
 	}