devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=44b3cd15642a1df5b1987de8507967f96f75fdc8
commit 44b3cd15642a1df5b1987de8507967f96f75fdc8
Author: Chris Michael <cp.mich...@samsung.com>
Date: Tue Apr 15 10:38:51 2014 +0100
ecore-wl: Check for existance of data device manager
@fix: Don't segfault if the running compositor never creates a data
device manager.
Signed-off-by: Chris Michael <cp.mich...@samsung.com>
---
src/lib/ecore_wayland/ecore_wl_input.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/lib/ecore_wayland/ecore_wl_input.c
b/src/lib/ecore_wayland/ecore_wl_input.c
index 3d5ff87..9bab9a1 100644
--- a/src/lib/ecore_wayland/ecore_wl_input.c
+++ b/src/lib/ecore_wayland/ecore_wl_input.c
@@ -349,11 +349,14 @@ _ecore_wl_input_add(Ecore_Wl_Display *ewd, unsigned int
id)
wl_array_init(&input->data_types);
- input->data_device =
- wl_data_device_manager_get_data_device(ewd->wl.data_device_manager,
- input->seat);
- wl_data_device_add_listener(input->data_device,
- &_ecore_wl_data_listener, input);
+ if (ewd->wl.data_device_manager)
+ {
+ input->data_device =
+ wl_data_device_manager_get_data_device(ewd->wl.data_device_manager,
+ input->seat);
+ wl_data_device_add_listener(input->data_device,
+ &_ecore_wl_data_listener, input);
+ }
ewd->input = input;
}
--
