raster pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=af92895931e54f63092dcb6cab7f4170788f8257
commit af92895931e54f63092dcb6cab7f4170788f8257 Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Tue Jun 4 12:38:34 2019 +0100 e - fix issue in emixer where sliders will not get disabled right recent changes to try disable sliders won't handle the slider list vs single slider right - warning pointed this out so fix it right. --- src/modules/mixer/emixer.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/modules/mixer/emixer.c b/src/modules/mixer/emixer.c index ae1719c25..576a87786 100644 --- a/src/modules/mixer/emixer.c +++ b/src/modules/mixer/emixer.c @@ -457,9 +457,9 @@ _cb_sink_input_lock_change(void *data, static void _emix_sink_input_volume_fill(Emix_Sink_Input *input, Evas_Object *bxv, Evas_Object *bx, Eina_Bool locked) { - Evas_Object *bxhv, *lb, *sl, *ck; + Evas_Object *bxhv, *lb, *sl = NULL, *ck; unsigned int i; - Eina_List *sls = NULL; + Eina_List *sls = NULL, *l; eina_list_free(evas_object_data_get(bxv, "volumes")); elm_box_clear(bx); @@ -527,6 +527,7 @@ _emix_sink_input_volume_fill(Emix_Sink_Input *input, Evas_Object *bxv, Evas_Obje elm_object_disabled_set(sl, input->mute); sls = eina_list_append(sls, sl); } + sl = NULL; } evas_object_data_set(bxv, "volumes", sls); @@ -538,7 +539,14 @@ _emix_sink_input_volume_fill(Emix_Sink_Input *input, Evas_Object *bxv, Evas_Obje evas_object_data_set(bxv, "mute", ck); elm_object_text_set(ck, "Mute"); elm_check_state_set(ck, input->mute); - elm_object_disabled_set(sl, input->mute); + if (sl) elm_object_disabled_set(sl, input->mute); + else if (sls) + { + EINA_LIST_FOREACH(sls, l, sl) + { + elm_object_disabled_set(sl, input->mute); + } + } elm_box_pack_end(bxhv, ck); evas_object_show(ck); evas_object_smart_callback_add(ck, "changed", --
