diff options
| author | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2014-08-07 16:21:30 +0900 |
|---|---|---|
| committer | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2014-08-07 16:21:30 +0900 |
| commit | f5871b196891bb4151cc72d5c4f343ac278546ba (patch) | |
| tree | ec57e66c555ebae9352570352562f606a80c811e | |
| parent | b96eb6863826b4e1ce21795b8689dda5797ebab6 (diff) | |
elm win - only auto choose x11/wl based on envvar if ELM_ENGINE unset
| -rw-r--r-- | src/lib/elm_win.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c index 40202697c..68f53651d 100644 --- a/src/lib/elm_win.c +++ b/src/lib/elm_win.c | |||
| @@ -3080,7 +3080,7 @@ _elm_win_constructor(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_Type t | |||
| 3080 | enginelist[0] = ENGINE_GET(); | 3080 | enginelist[0] = ENGINE_GET(); |
| 3081 | enginelist[1] = NULL; | 3081 | enginelist[1] = NULL; |
| 3082 | } | 3082 | } |
| 3083 | else if (getenv("DISPLAY")) | 3083 | else if ((getenv("DISPLAY")) && (!getenv("ELM_ENGINE"))) |
| 3084 | { | 3084 | { |
| 3085 | if (_accel_is_gl()) | 3085 | if (_accel_is_gl()) |
| 3086 | { | 3086 | { |
| @@ -3095,7 +3095,7 @@ _elm_win_constructor(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_Type t | |||
| 3095 | enginelist[2] = NULL; | 3095 | enginelist[2] = NULL; |
| 3096 | } | 3096 | } |
| 3097 | } | 3097 | } |
| 3098 | else if (getenv("WAYLAND_DISPLAY")) | 3098 | else if ((getenv("WAYLAND_DISPLAY")) && (!getenv("ELM_ENGINE"))) |
| 3099 | { | 3099 | { |
| 3100 | if (_accel_is_gl()) | 3100 | if (_accel_is_gl()) |
| 3101 | { | 3101 | { |