Merge branch 'v0.20.x'

2017-02-19 19:46:18 +01:00
parent 3b84b99804 f3b788703e
commit 7e46277016
6 changed files with 16 additions and 6 deletions
--- a/src/mixer/plugins/AlsaMixerPlugin.cxx
+++ b/src/mixer/plugins/AlsaMixerPlugin.cxx
@@ -58,6 +58,7 @@ public:
 	~AlsaMixerMonitor() {
 		BlockingCall(MultiSocketMonitor::GetEventLoop(), [this](){
 				MultiSocketMonitor::Reset();
+				DeferredMonitor::Cancel();
 			});
 	}