Merge tag 'v0.20.16'

release v0.20.16
2018-02-03 19:59:29 +01:00
parent 73ddbcc876 975a4ae871
commit 250b6a3d52
8 changed files with 29 additions and 7 deletions
--- a/src/output/plugins/PulseOutputPlugin.cxx
+++ b/src/output/plugins/PulseOutputPlugin.cxx
@@ -26,6 +26,7 @@
 #include "../OutputAPI.hxx"
 #include "mixer/MixerList.hxx"
 #include "mixer/plugins/PulseMixerPlugin.hxx"
+#include "util/ScopeExit.hxx"
 #include "Log.hxx"

 #include <pulse/thread-mainloop.h>
@@ -854,7 +855,10 @@ PulseOutput::TestDefaultDevice()
 try {
 	const ConfigBlock empty;
 	PulseOutput po(empty);
+	po.Enable();
+	AtScopeExit(&po) { po.Disable(); };
 	po.WaitConnection();
+
 	return true;
 } catch (...) {
 	return false;