Commit eb771eaf authored by Max Kellermann's avatar Max Kellermann

output/Thread: re-lock the mutex after flush error

Fixes deadlock due to mutex double lock.
parent 6908555e
......@@ -379,11 +379,11 @@ PlayFull(FilteredAudioOutput &output, ConstBuffer<void> _buffer)
inline void
AudioOutputControl::InternalDrain() noexcept
{
const ScopeUnlock unlock(mutex);
try {
/* flush the filter and play its remaining output */
const ScopeUnlock unlock(mutex);
while (true) {
auto buffer = source.Flush();
if (buffer.IsNull())
......@@ -391,14 +391,14 @@ AudioOutputControl::InternalDrain() noexcept
PlayFull(*output, buffer);
}
output->Drain();
} catch (...) {
FormatError(std::current_exception(),
"Failed to flush filter on %s", GetLogName());
InternalCloseError(std::current_exception());
return;
}
output->Drain();
}
void
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment