From 6967aa14573b68166838af71904f87e7d4791462 Mon Sep 17 00:00:00 2001 From: Chris Michael Date: Tue, 5 Jan 2016 13:10:40 -0500 Subject: [PATCH] ecore-wl2: Fix support for nested compositors When trying to create nested compositors, we were failing here due to trying to read the WAYLAND_DISPLAY env variable and find an existing server display to match. In order for nested compositors to function, we cannot reuse that environment variable for server display hash. @fix Signed-off-by: Chris Michael --- src/lib/ecore_wl2/ecore_wl2_display.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/src/lib/ecore_wl2/ecore_wl2_display.c b/src/lib/ecore_wl2/ecore_wl2_display.c index 0313322dcc..3f9f64704c 100644 --- a/src/lib/ecore_wl2/ecore_wl2_display.c +++ b/src/lib/ecore_wl2/ecore_wl2_display.c @@ -401,22 +401,7 @@ ecore_wl2_display_create(const char *name) if (!_server_displays) _server_displays = eina_hash_string_superfast_new(NULL); - if (!name) - { - const char *n; - - /* someone wants to create a new server */ - n = getenv("WAYLAND_DISPLAY"); - if (n) - { - /* we have a default wayland display */ - - /* check hash of cached server displays for this name */ - ewd = eina_hash_find(_server_displays, n); - if (ewd) goto found; - } - } - else + if (name) { /* someone wants to create a server with a specific display */