summaryrefslogtreecommitdiff
path: root/src/modules/mixer/e_mod_main.c
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2012-09-14 00:33:36 +0000
committerCarsten Haitzler <raster@rasterman.com>2012-09-14 00:33:36 +0000
commit4acc7c4eb9bf63318a6cc7ea157613f958acc022 (patch)
tree76195feb15d8d6dcd14b04a319f974a3d0ddd062 /src/modules/mixer/e_mod_main.c
parentf7e3736068e3ae81bea15b8ca25a53b2fc96f92a (diff)
downloadenlightenment-4acc7c4eb9bf63318a6cc7ea157613f958acc022.tar.gz
well then.. let's not segv if card is null... yes - this is new
behaviour in mixer... at leats i'm not stuck with e crashing almost instantly on start :) SVN revision: 76631
Diffstat (limited to 'src/modules/mixer/e_mod_main.c')
-rw-r--r--src/modules/mixer/e_mod_main.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/modules/mixer/e_mod_main.c b/src/modules/mixer/e_mod_main.c
index fd4412e19d..32cb5ce6a3 100644
--- a/src/modules/mixer/e_mod_main.c
+++ b/src/modules/mixer/e_mod_main.c
@@ -834,6 +834,12 @@ _mixer_sys_setup(E_Mixer_Instance *inst)
conf = inst->conf;
if ((!_mixer_using_default) && (!e_mixer_pulse_ready())) return 1;
+ if (!conf->card)
+ {
+ ERR("conf->card in mixer sys setup is NULL");
+ return 1;
+ }
+
if (inst->sys)
e_mod_mixer_del(inst->sys);