forked from enlightenment/efl
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 <cpmichael@osg.samsung.com>
This commit is contained in:
parent
6afbd272bd
commit
6967aa1457
|
@ -401,22 +401,7 @@ ecore_wl2_display_create(const char *name)
|
||||||
if (!_server_displays)
|
if (!_server_displays)
|
||||||
_server_displays = eina_hash_string_superfast_new(NULL);
|
_server_displays = eina_hash_string_superfast_new(NULL);
|
||||||
|
|
||||||
if (!name)
|
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
|
|
||||||
{
|
{
|
||||||
/* someone wants to create a server with a specific display */
|
/* someone wants to create a server with a specific display */
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue