Skip to content

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

{input,mixer}/alsa: cancel the DeferredMonitor in the destructor

Yet another potential crash bug fix.
parent 7372c931
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
src/input/plugins/AlsaInputPlugin.cxx
View file @ 20ae84bf
...@@ -100,6 +100,7 @@ public: ...@@ -100,6 +100,7 @@ public:
~AlsaInputStream() { ~AlsaInputStream() {
BlockingCall(MultiSocketMonitor::GetEventLoop(), [this](){ BlockingCall(MultiSocketMonitor::GetEventLoop(), [this](){
MultiSocketMonitor::Reset(); MultiSocketMonitor::Reset();
DeferredMonitor::Cancel();
}); });
snd_pcm_close(capture_handle); snd_pcm_close(capture_handle);
......
src/mixer/plugins/AlsaMixerPlugin.cxx
View file @ 20ae84bf
...@@ -57,6 +57,7 @@ public: ...@@ -57,6 +57,7 @@ public:
~AlsaMixerMonitor() { ~AlsaMixerMonitor() {
BlockingCall(MultiSocketMonitor::GetEventLoop(), [this](){ BlockingCall(MultiSocketMonitor::GetEventLoop(), [this](){
MultiSocketMonitor::Reset(); MultiSocketMonitor::Reset();
DeferredMonitor::Cancel();
}); });
} }
......
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