discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=0d527b03f4f630e81ab4480d7160bbf6352b0bac
commit 0d527b03f4f630e81ab4480d7160bbf6352b0bac Author: Mike Blumenkrantz <[email protected]> Date: Tue Sep 23 16:44:17 2014 -0400 elm_win should not check ELM_ACCEL variable if application has overridden it also simplify these checks to make it more clear how the ordering should work @fix --- src/lib/elm_win.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c index 1de2075..43a3488 100644 --- a/src/lib/elm_win.c +++ b/src/lib/elm_win.c @@ -2943,15 +2943,17 @@ _window_layout_stack(Evas_Object *o, Evas_Object_Box_Data *p, void *data) static Eina_Bool _accel_is_gl(void) { - const char *env = NULL; - const char *str = NULL; - - if (_elm_config->accel) str = _elm_config->accel; - if (_elm_accel_preference) str = _elm_accel_preference; - if ((_elm_config->accel_override) && (_elm_config->accel)) - str = _elm_config->accel; - env = getenv("ELM_ACCEL"); - if (env) str = env; + const char *str; + + str = _elm_config->accel; + if (!_elm_config->accel_override) + { + const char *env = NULL; + + env = getenv("ELM_ACCEL"); + if (env) str = env; + else if (_elm_accel_preference) str = _elm_accel_preference; + } if ((str) && ((!strcasecmp(str, "gl")) || (!strcasecmp(str, "opengl")) || --
