From a32410f0e137c1c20aa272ee8f8cfed9bd20b10e Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Thu, 7 Aug 2014 16:21:30 +0900 Subject: [PATCH] elm win - only auto choose x11/wl based on envvar if ELM_ENGINE unset --- legacy/elementary/src/lib/elm_win.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/legacy/elementary/src/lib/elm_win.c b/legacy/elementary/src/lib/elm_win.c index 40202697c0..68f53651db 100644 --- a/legacy/elementary/src/lib/elm_win.c +++ b/legacy/elementary/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 enginelist[0] = ENGINE_GET(); enginelist[1] = NULL; } - else if (getenv("DISPLAY")) + else if ((getenv("DISPLAY")) && (!getenv("ELM_ENGINE"))) { if (_accel_is_gl()) { @@ -3095,7 +3095,7 @@ _elm_win_constructor(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_Type t enginelist[2] = NULL; } } - else if (getenv("WAYLAND_DISPLAY")) + else if ((getenv("WAYLAND_DISPLAY")) && (!getenv("ELM_ENGINE"))) { if (_accel_is_gl()) {