forked from enlightenment/efl
ecore-wayland: Add safety check for window surface creation
Summary: We cannot call wl_proxy_get_id if the surface creation failed else that would lead to an abort in the wayland libraries. This commit adds a safety check @fix Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
parent
5244ad1f8d
commit
728833ed43
|
@ -261,7 +261,7 @@ ecore_wl_window_buffer_attach(Ecore_Wl_Window *win, struct wl_buffer *buffer, in
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI struct wl_surface*
|
EAPI struct wl_surface *
|
||||||
ecore_wl_window_surface_create(Ecore_Wl_Window *win)
|
ecore_wl_window_surface_create(Ecore_Wl_Window *win)
|
||||||
{
|
{
|
||||||
LOGFN(__FILE__, __LINE__, __FUNCTION__);
|
LOGFN(__FILE__, __LINE__, __FUNCTION__);
|
||||||
|
@ -269,6 +269,7 @@ ecore_wl_window_surface_create(Ecore_Wl_Window *win)
|
||||||
if (!win) return NULL;
|
if (!win) return NULL;
|
||||||
if (win->surface) return win->surface;
|
if (win->surface) return win->surface;
|
||||||
win->surface = wl_compositor_create_surface(_ecore_wl_compositor_get());
|
win->surface = wl_compositor_create_surface(_ecore_wl_compositor_get());
|
||||||
|
if (!win->surface) return NULL;
|
||||||
win->surface_id = wl_proxy_get_id((struct wl_proxy *)win->surface);
|
win->surface_id = wl_proxy_get_id((struct wl_proxy *)win->surface);
|
||||||
return win->surface;
|
return win->surface;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue