output/alsa: rethrow errors in Drain()

5dfdc15f · Max Kellermann · a6e58734 · 5dfdc15f
Commit 5dfdc15f authored Apr 26, 2018 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

AlsaOutputPlugin.cxx src/output/plugins/AlsaOutputPlugin.cxx +8 -1

No files found.
--- a/src/output/plugins/AlsaOutputPlugin.cxx
+++ b/src/output/plugins/AlsaOutputPlugin.cxx
@@ -762,12 +762,19 @@ AlsaOutput::Drain()
 {
 	const std::lock_guard<Mutex> lock(mutex);

+	if (error)
+		std::rethrow_exception(error);
+
 	drain = true;

 	UnlockActivate();

-	while (drain && !error)
+	while (drain) {
+		if (error)
+			std::rethrow_exception(error);
+
 		cond.wait(mutex);
+	}
 }

 inline void