summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2014-09-23 16:44:17 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2014-09-23 16:45:15 -0400
commit0d527b03f4f630e81ab4480d7160bbf6352b0bac (patch)
tree691582a89a9b7b2ba7de1dc967e5bb2711821383 /src
parent2245d5936562ad269eafec250c88b8be8486b78b (diff)
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
Diffstat (limited to 'src')
-rw-r--r--src/lib/elm_win.c20
1 files changed, 11 insertions, 9 deletions
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 1de207578..43a348890 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)
2943static Eina_Bool 2943static Eina_Bool
2944_accel_is_gl(void) 2944_accel_is_gl(void)
2945{ 2945{
2946 const char *env = NULL; 2946 const char *str;
2947 const char *str = NULL; 2947
2948 2948 str = _elm_config->accel;
2949 if (_elm_config->accel) str = _elm_config->accel; 2949 if (!_elm_config->accel_override)
2950 if (_elm_accel_preference) str = _elm_accel_preference; 2950 {
2951 if ((_elm_config->accel_override) && (_elm_config->accel)) 2951 const char *env = NULL;
2952 str = _elm_config->accel; 2952
2953 env = getenv("ELM_ACCEL"); 2953 env = getenv("ELM_ACCEL");
2954 if (env) str = env; 2954 if (env) str = env;
2955 else if (_elm_accel_preference) str = _elm_accel_preference;
2956 }
2955 if ((str) && 2957 if ((str) &&
2956 ((!strcasecmp(str, "gl")) || 2958 ((!strcasecmp(str, "gl")) ||
2957 (!strcasecmp(str, "opengl")) || 2959 (!strcasecmp(str, "opengl")) ||