diff options
| author | Chris Michael <cp.michael@samsung.com> | 2017-02-27 12:35:58 -0500 |
|---|---|---|
| committer | Chris Michael <cp.michael@samsung.com> | 2017-02-27 12:35:58 -0500 |
| commit | 0a9542e2231cc8172269fba39f2173c6713c794a (patch) | |
| tree | ed75c7984d5f1dacd8ec9fb83e22210e5fd15f61 | |
| parent | 38f3854f45bcfca566feee882919d7a66f92ce13 (diff) | |
| download | efl-0a9542e2231cc8172269fba39f2173c6713c794a.tar.gz | |
elementary: Fix issue of trying to init ecore_wl2 if DISPLAY is set
Small patch to fix an issue that Derek brought up ... that is
basically, if you try:
WAYLAND_DEBUG=1 WAYLAND_DISPLAY=wayland-0 terminology while inside an
X11 environment, then elm_config would try to initialize ecore_wl2
even when running under X11.
@fix
Signed-off-by: Chris Michael <cp.michael@samsung.com>
| -rw-r--r-- | src/lib/elementary/elm_config.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/elementary/elm_config.c b/src/lib/elementary/elm_config.c index 756d54ddf1..269c5d3cf3 100644 --- a/src/lib/elementary/elm_config.c +++ b/src/lib/elementary/elm_config.c @@ -3927,7 +3927,7 @@ _elm_config_sub_init(void) if (ev) /* If ELM_DISPLAY is specified */ { - if (!strcmp(ev, "wl")) /* and it is X11 */ + if (!strcmp(ev, "wl")) /* and it is WL */ { /* always try to connect to wl when it is enforced */ init_wl = EINA_TRUE; @@ -3937,7 +3937,8 @@ _elm_config_sub_init(void) } else /* ELM_DISPLAY not specified */ { - if (have_wl_display) /* If there is a $WAYLAND_DISPLAY */ + /* If there is a $WAYLAND_DISPLAY */ + if ((have_wl_display) && (!getenv("DISPLAY"))) init_wl = EINA_TRUE; else /* No $WAYLAND_DISPLAY */ init_wl = EINA_FALSE; |