discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=ac7a786b5910de4c803eece197c57b1f2eeaa771
commit ac7a786b5910de4c803eece197c57b1f2eeaa771 Author: Mike Blumenkrantz <[email protected]> Date: Mon Dec 29 17:31:08 2014 -0500 don't show mixer popup during nocomp fix T1270 --- src/modules/mixer/e_mod_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/mixer/e_mod_main.c b/src/modules/mixer/e_mod_main.c index 7d09671..77b0172 100644 --- a/src/modules/mixer/e_mod_main.c +++ b/src/modules/mixer/e_mod_main.c @@ -1123,7 +1123,7 @@ _mixer_cb_volume_modify(Eina_Bool up) ctxt->last_act_time = ecore_loop_time_get(); - if (ctxt->default_instance->conf->keybindings_popup) + if (ctxt->default_instance->conf->keybindings_popup && (!e_comp_get(NULL)->nocomp)) _mixer_popup_timer_new(ctxt->default_instance); _mixer_volume_change(ctxt->default_instance, up, EINA_TRUE); } @@ -1160,7 +1160,7 @@ _mixer_cb_volume_mute(E_Object *obj __UNUSED__, const char *params __UNUSED__) ctxt->last_act_time = ecore_loop_time_get(); - if (ctxt->default_instance->conf->keybindings_popup) + if (ctxt->default_instance->conf->keybindings_popup && (!e_comp_get(NULL)->nocomp)) _mixer_popup_timer_new(ctxt->default_instance); _mixer_toggle_mute(ctxt->default_instance, EINA_TRUE); } --
