oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

output/pulse: fix crash during auto-detection

Browse Source 
The PulseOutput needs to be "enabled" before WaitConnection() may be
called.

Closes #207
This commit is contained in:
Max Kellermann 2018-01-30 10:06:36 +01:00
parent ea66cdd6a5
commit ec408ca6a6
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -1,4 +1,6 @@
ver 0.20.16 (not yet released) ver 0.20.16 (not yet released)
* output
- pulse: fix crash during auto-detection
* database * database
- simple: fix search within mount points - simple: fix search within mount points
* fix crash in debug build on Haiku and other operating systems * fix crash in debug build on Haiku and other operating systems

4
src/output/plugins/PulseOutputPlugin.cxx
View File

@ -27,6 +27,7 @@
#include "../Wrapper.hxx" #include "../Wrapper.hxx"
#include "mixer/MixerList.hxx" #include "mixer/MixerList.hxx"
#include "mixer/plugins/PulseMixerPlugin.hxx" #include "mixer/plugins/PulseMixerPlugin.hxx"
#include "util/ScopeExit.hxx"
#include "Log.hxx" #include "Log.hxx"
#include <pulse/thread-mainloop.h> #include <pulse/thread-mainloop.h>
@ -854,7 +855,10 @@ PulseOutput::TestDefaultDevice()
try { try {
const ConfigBlock empty; const ConfigBlock empty;
PulseOutput po(empty); PulseOutput po(empty);
po.Enable();
AtScopeExit(&po) { po.Disable(); };
po.WaitConnection(); po.WaitConnection();
return true; return true;
} catch (const std::runtime_error &e) { } catch (const std::runtime_error &e) {
return false; return false;