From 5675ed26cd18668e2387c643bb48a20cdea65413 Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Mon, 10 Aug 2015 19:23:53 +0200 Subject: [PATCH] mixer: Fix segfault when backend does not have any sink --- src/modules/mixer/e_mod_main.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/modules/mixer/e_mod_main.c b/src/modules/mixer/e_mod_main.c index 113da66d7..ea204dbca 100644 --- a/src/modules/mixer/e_mod_main.c +++ b/src/modules/mixer/e_mod_main.c @@ -638,7 +638,10 @@ _sink_event(int type, void *info) if (sink == mixer_context->sink_default) { l = emix_sinks_get(); - mixer_context->sink_default = l->data; + if (l) + mixer_context->sink_default = l->data; + else + mixer_context->sink_default = NULL; _mixer_gadget_update(); } } @@ -669,7 +672,10 @@ _ready(void) if (emix_sink_default_support()) mixer_context->sink_default = emix_sink_default_get(); else - mixer_context->sink_default = emix_sinks_get()->data; + { + if (emix_sinks_get()) + mixer_context->sink_default = emix_sinks_get()->data; + } _mixer_gadget_update(); }