kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Chris Michael 2017-02-27 12:35:58 -05:00
parent 38f3854f45
commit 0a9542e223
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lib/elementary/elm_config.c
View File

@ -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;