From 4c6f4234819d6dd67408254f71d9eeb6e7ddb0fc Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Fri, 24 Feb 2012 11:02:55 +0000 Subject: [PATCH] elementary: avoid segv and don't duplicate call. SVN revision: 68395 --- legacy/elementary/src/lib/elm_win.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/legacy/elementary/src/lib/elm_win.c b/legacy/elementary/src/lib/elm_win.c index 34db304ee3..eeb63aea35 100644 --- a/legacy/elementary/src/lib/elm_win.c +++ b/legacy/elementary/src/lib/elm_win.c @@ -1558,7 +1558,7 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type) if (win->ee) \ elm_engine_set(ecore_evas_engine_name_get(win->ee)); \ } while (0) -#define ENGINE_COMPARE(name) (!strcmp(_elm_config->engine, name)) +#define ENGINE_COMPARE(name) (_elm_config->engine && !strcmp(_elm_config->engine, name)) switch (type) { @@ -1704,7 +1704,6 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type) else if (ENGINE_COMPARE(ELM_WAYLAND_SHM)) { win->ee = ecore_evas_wayland_shm_new(NULL, 0, 0, 1, 1, 0); - win->evas = ecore_evas_get(win->ee); _elm_win_frame_add(win, "default"); _elm_win_pointer_add(win, "default"); @@ -1712,7 +1711,6 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type) else if (ENGINE_COMPARE(ELM_WAYLAND_EGL)) { win->ee = ecore_evas_wayland_egl_new(NULL, 0, 0, 1, 1, 0); - win->evas = ecore_evas_get(win->ee); _elm_win_frame_add(win, "default"); _elm_win_pointer_add(win, "default");