Skip to content

M
mpd
Commit b42f19f5 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

output/Control: implicitly call BeginDestroy() in destructor

parent 92022658
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
src/output/Control.cxx
View file @ b42f19f5
...@@ -42,6 +42,8 @@ AudioOutputControl::AudioOutputControl(std::unique_ptr<FilteredAudioOutput> _out ...@@ -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 ...@@ -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);
} }
} }
src/output/MultipleOutputs.cxx
View file @ b42f19f5
...@@ -84,7 +84,6 @@ LoadOutputControl(EventLoop &event_loop, ...@@ -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;
} }
......
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