From ac26c0a69d0b4fc4b8e3517e23fe6b5c3b77a555 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 10 Jul 2019 13:57:33 -0400 Subject: [PATCH] efl/selection_manager: only create wl event handlers if using wl connection Summary: this codepath is broken if the wl server connection does not exist Depends on D9252 Reviewers: bu5hm4n Reviewed By: bu5hm4n Subscribers: bu5hm4n, cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D9253 --- src/lib/elementary/efl_ui_selection_manager.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/lib/elementary/efl_ui_selection_manager.c b/src/lib/elementary/efl_ui_selection_manager.c index 5c4db17b0c..9ccfe40eb4 100644 --- a/src/lib/elementary/efl_ui_selection_manager.c +++ b/src/lib/elementary/efl_ui_selection_manager.c @@ -5503,9 +5503,12 @@ _efl_ui_selection_manager_efl_object_destructor(Eo *obj, Efl_Ui_Selection_Manage ecore_event_handler_del(pd->clear_handler); #endif #ifdef HAVE_ELEMENTARY_WL2 - ecore_event_handler_del(pd->send_handler); - ecore_event_handler_del(pd->changed_handler); - ecore_event_handler_del(pd->end_handler); + if (_elm_wl_display) + { + ecore_event_handler_del(pd->send_handler); + ecore_event_handler_del(pd->changed_handler); + ecore_event_handler_del(pd->end_handler); + } #endif free(pd->atom_list); EINA_LIST_FREE(pd->seat_list, seat_sel)