projects
/
platform
/
upstream
/
efl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e9fab75
)
ecore-wl2: Cancel data callback if we have a fatal error
author
Chris Michael
<cp.michael@samsung.com>
Wed, 18 Nov 2015 14:21:23 +0000
(09:21 -0500)
committer
Chris Michael
<cp.michael@samsung.com>
Thu, 3 Dec 2015 17:05:01 +0000
(12:05 -0500)
Signed-off-by: Chris Michael <cp.michael@samsung.com>
src/lib/ecore_wl2/ecore_wl2_display.c
patch
|
blob
|
history
diff --git
a/src/lib/ecore_wl2/ecore_wl2_display.c
b/src/lib/ecore_wl2/ecore_wl2_display.c
index
ec078c2
..
22b76b7
100644
(file)
--- a/
src/lib/ecore_wl2/ecore_wl2_display.c
+++ b/
src/lib/ecore_wl2/ecore_wl2_display.c
@@
-169,6
+169,8
@@
_cb_create_data(void *data, Ecore_Fd_Handler *hdl)
ewd = data;
+ if (_fatal_error) return ECORE_CALLBACK_CANCEL;
+
if (ecore_main_fd_handler_active_get(hdl, ECORE_FD_ERROR))
{
ERR("Received Fatal Error on Wayland Display");
@@
-450,6
+452,7
@@
ecore_wl2_display_create(const char *name)
}
setenv("WAYLAND_DISPLAY", ewd->name, 1);
+ DBG("WAYLAND_DISPLAY: %s", ewd->name);
loop = wl_display_get_event_loop(ewd->wl.display);