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

output/httpd: move Close() lock into the I/O thread

Browse Source 
Fixes a potential deadlock introduced by commit 945287358b
This commit is contained in:
Max Kellermann 2017-02-19 20:40:06 +01:00
parent 26e4a40cc7
commit f88f1fca3f
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/output/plugins/httpd/HttpdOutputPlugin.cxx
View File

@ -266,14 +266,13 @@ HttpdOutput::Open(AudioFormat &audio_format)
inline void inline void
HttpdOutput::Close() HttpdOutput::Close()
{ {
const std::lock_guard<Mutex> protect(mutex);
assert(open); assert(open);
open = false;
delete timer; delete timer;
BlockingCall(GetEventLoop(), [this](){ BlockingCall(GetEventLoop(), [this](){
const std::lock_guard<Mutex> protect(mutex);
open = false;
clients.clear_and_dispose(DeleteDisposer()); clients.clear_and_dispose(DeleteDisposer());
}); });