From e215829316c0bf9c7e8e6c4142e3167a1dc2d6df Mon Sep 17 00:00:00 2001 From: Preshit Agarwal Date: Tue, 21 Jun 2016 14:27:43 +0530 Subject: [PATCH] KeyRouter: Add destroyed surface check before removing grab mode. Change-Id: Ia1e847ab94af5e00cf156572240ac1bc5b255c25 Signed-off-by: Preshit Agarwal --- src/e_mod_keyrouter_list.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/e_mod_keyrouter_list.c b/src/e_mod_keyrouter_list.c index 4c38454..2ded4ee 100644 --- a/src/e_mod_keyrouter_list.c +++ b/src/e_mod_keyrouter_list.c @@ -370,8 +370,11 @@ e_keyrouter_remove_client_from_list(struct wl_resource *surface, struct wl_clien if (!key_node_data) continue; if (surface) { - krt->HardKeys[i].pic_off_ptr = eina_list_remove_list(krt->HardKeys[i].pic_off_ptr, l); - E_FREE(key_node_data); + if (surface == key_node_data->surface) + { + krt->HardKeys[i].pic_off_ptr = eina_list_remove_list(krt->HardKeys[i].pic_off_ptr, l); + E_FREE(key_node_data); + } } else if ( wc == key_node_data->wc) { -- 2.34.1