From ebac51cad8e144b64938e6726e26bdc23aaf45e5 Mon Sep 17 00:00:00 2001
From: Lorenz Meier <lm@inf.ethz.ch>
Date: Thu, 7 Mar 2013 19:47:43 +0100
Subject: Working on restart resilience, hunting down multi-load mixer issue
 (still present)

---
 apps/systemlib/mixer/mixer.cpp       | 1 +
 apps/systemlib/mixer/mixer_group.cpp | 1 +
 2 files changed, 2 insertions(+)

(limited to 'apps/systemlib')

diff --git a/apps/systemlib/mixer/mixer.cpp b/apps/systemlib/mixer/mixer.cpp
index 72f765d90..df0dfe838 100644
--- a/apps/systemlib/mixer/mixer.cpp
+++ b/apps/systemlib/mixer/mixer.cpp
@@ -54,6 +54,7 @@
 #include "mixer.h"
 
 Mixer::Mixer(ControlCallback control_cb, uintptr_t cb_handle) :
+	_next(nullptr),
 	_control_cb(control_cb),
 	_cb_handle(cb_handle)
 {
diff --git a/apps/systemlib/mixer/mixer_group.cpp b/apps/systemlib/mixer/mixer_group.cpp
index 60eeff225..1dbc512cd 100644
--- a/apps/systemlib/mixer/mixer_group.cpp
+++ b/apps/systemlib/mixer/mixer_group.cpp
@@ -93,6 +93,7 @@ MixerGroup::reset()
 		mixer = _first;
 		_first = mixer->_next;
 		delete mixer;
+		mixer = nullptr;
 	}
 }
 
-- 
cgit v1.2.3