raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=f5871b196891bb4151cc72d5c4f343ac278546ba
commit f5871b196891bb4151cc72d5c4f343ac278546ba
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date: Thu Aug 7 16:21:30 2014 +0900
elm win - only auto choose x11/wl based on envvar if ELM_ENGINE unset
---
src/lib/elm_win.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 4020269..68f5365 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
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())
{
--
