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

Fixes a potential deadlock introduced by commit 94528735

output/httpd: move Close() lock into the I/O thread
f88f1fca · Max Kellermann · 26e4a40c · f88f1fca
Commit f88f1fca authored Feb 19, 2017 by Max Kellermann
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

HttpdOutputPlugin.cxx src/output/plugins/httpd/HttpdOutputPlugin.cxx +2 -3

No files found.
--- a/src/output/plugins/httpd/HttpdOutputPlugin.cxx
+++ b/src/output/plugins/httpd/HttpdOutputPlugin.cxx
@@ -266,14 +266,13 @@ HttpdOutput::Open(AudioFormat &audio_format)
 inline void
 HttpdOutput::Close()
 {
-	const std::lock_guard<Mutex> protect(mutex);
-
 	assert(open);
-	open = false;

 	delete timer;

 	BlockingCall(GetEventLoop(), [this](){
+			const std::lock_guard<Mutex> protect(mutex);
+			open = false;
 			clients.clear_and_dispose(DeleteDisposer());
 		});