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

Yet another potential crash bug fix.

{input,mixer}/alsa: cancel the DeferredMonitor in the destructor
20ae84bf · Max Kellermann · 7372c931 · 20ae84bf · 20ae84bf
Commit 20ae84bf authored Feb 10, 2017 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

AlsaInputPlugin.cxx src/input/plugins/AlsaInputPlugin.cxx +1 -0

AlsaMixerPlugin.cxx src/mixer/plugins/AlsaMixerPlugin.cxx +1 -0

No files found.
--- a/src/input/plugins/AlsaInputPlugin.cxx
+++ b/src/input/plugins/AlsaInputPlugin.cxx
@@ -100,6 +100,7 @@ public:
 	~AlsaInputStream() {
 		BlockingCall(MultiSocketMonitor::GetEventLoop(), [this](){
 				MultiSocketMonitor::Reset();
+				DeferredMonitor::Cancel();
 			});

 		snd_pcm_close(capture_handle);

--- a/src/mixer/plugins/AlsaMixerPlugin.cxx
+++ b/src/mixer/plugins/AlsaMixerPlugin.cxx
@@ -57,6 +57,7 @@ public:
 	~AlsaMixerMonitor() {
 		BlockingCall(MultiSocketMonitor::GetEventLoop(), [this](){
 				MultiSocketMonitor::Reset();
+				DeferredMonitor::Cancel();
 			});
 	}