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

output/Control: implicitly call BeginDestroy() in destructor

Browse Source
This commit is contained in:
Max Kellermann 2019-04-26 14:28:30 +02:00
parent 92022658f9
commit b42f19f514
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/output/Control.cxx
View File

@ -42,6 +42,8 @@ AudioOutputControl::AudioOutputControl(std::unique_ptr<FilteredAudioOutput> _out
AudioOutputControl::~AudioOutputControl() noexcept AudioOutputControl::~AudioOutputControl() noexcept
{ {
BeginDestroy();
if (thread.IsDefined()) if (thread.IsDefined())
thread.Join(); thread.Join();
} }
@ -378,6 +380,7 @@ AudioOutputControl::BeginDestroy() noexcept
{ {
if (thread.IsDefined()) { if (thread.IsDefined()) {
const std::lock_guard<Mutex> protect(mutex); const std::lock_guard<Mutex> protect(mutex);
if (IsCommandFinished())
CommandAsync(Command::KILL); CommandAsync(Command::KILL);
} }
} }

1
src/output/MultipleOutputs.cxx
View File

@ -84,7 +84,6 @@ LoadOutputControl(EventLoop &event_loop,
try { try {
control->Configure(block); control->Configure(block);
} catch (...) { } catch (...) {
control->BeginDestroy();
delete control; delete control;
throw; throw;
} }