diff options
author | Mike Blumenkrantz <zmike@samsung.com> | 2014-06-02 09:13:55 -0400 |
---|---|---|
committer | Cedric BAIL <cedric@osg.samsung.com> | 2015-08-17 18:10:13 +0200 |
commit | 891957f5df54803dc822109be607e24283383f23 (patch) | |
tree | 13c144943f78060ee36764d650118e8e03a7966f | |
parent | 514e644c5cb981d9d0bb2e3c2bbe4abe4202dfa9 (diff) | |
download | enlightenment-891957f5df54803dc822109be607e24283383f23.tar.gz |
block mixer crashes during init
fix T1305
-rw-r--r-- | src/modules/mixer/e_mod_main.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/modules/mixer/e_mod_main.c b/src/modules/mixer/e_mod_main.c index 1fc2fd6cf3..4751498022 100644 --- a/src/modules/mixer/e_mod_main.c +++ b/src/modules/mixer/e_mod_main.c @@ -262,6 +262,7 @@ _mixer_balance_left(E_Mixer_Instance *inst) E_Mixer_Channel_State *state; state = &inst->mixer_state; + if (!inst->channel) return; e_mod_mixer_volume_get(inst->sys, inst->channel, &state->left, &state->right); if (state->left >= 0) @@ -377,6 +378,7 @@ _mixer_toggle_mute(E_Mixer_Instance *inst, Eina_Bool non_ui) { E_Mixer_Channel_State *state; + if (!inst->channel) return; if (!e_mod_mixer_mutable_get(inst->sys, inst->channel)) return; @@ -401,6 +403,7 @@ _mixer_popup_cb_volume_left_change(void *data, Evas_Object *obj, void *event __U E_Mixer_Instance *inst = data; E_Mixer_Channel_State *state = &inst->mixer_state; + if (!inst->channel) return; e_mod_mixer_volume_get(inst->sys, inst->channel, &state->left, &state->right); @@ -422,6 +425,7 @@ _mixer_popup_cb_volume_right_change(void *data, Evas_Object *obj, void *event __ E_Mixer_Instance *inst = data; E_Mixer_Channel_State *state = &inst->mixer_state; + if (!inst->channel) return; e_mod_mixer_volume_get(inst->sys, inst->channel, &state->left, &state->right); @@ -443,6 +447,7 @@ _mixer_popup_cb_mute_change(void *data, Evas_Object *obj, void *event __UNUSED__ E_Mixer_Instance *inst = data; E_Mixer_Channel_State *state = &inst->mixer_state; + if (!inst->channel) return; state->mute = e_widget_check_checked_get(obj); e_mod_mixer_mute_set(inst->sys, inst->channel, state->mute); |