summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2014-04-15 10:38:51 +0100
committerChris Michael <cp.michael@samsung.com>2014-04-15 10:41:54 +0100
commit44b3cd15642a1df5b1987de8507967f96f75fdc8 (patch)
tree7e6258a36eb821e1ebc952f928a078d0515f5489 /src
parent6699d427c1687d5ab4279a0d4753181d939a5bea (diff)
downloadefl-44b3cd15642a1df5b1987de8507967f96f75fdc8.tar.gz
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.michael@samsung.com>
Diffstat (limited to 'src')
-rw-r--r--src/lib/ecore_wayland/ecore_wl_input.c13
1 files 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 3d5ff87c8b..9bab9a17be 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;
}