elm win - only auto choose x11/wl based on envvar if ELM_ENGINE unset
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>
Thu, 7 Aug 2014 07:21:30 +0000 (16:21 +0900)
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>
Thu, 7 Aug 2014 07:21:30 +0000 (16:21 +0900)
legacy/elementary/src/lib/elm_win.c

index 4020269..68f5365 100644 (file)
@@ -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())
                {