From d00e10690d729a35bc7c92daae7b163bbb9d6389 Mon Sep 17 00:00:00 2001 From: Sung-Jin Park Date: Fri, 26 Apr 2019 15:59:48 +0900 Subject: [PATCH] keyrouter: fix not to call _pepper_keyrouter_cb_resource_destory twice while destroying itself Change-Id: I5e34250cbf13237f0f0b7973daf4324488bde847 Signed-off-by: Sung-Jin Park --- src/lib/keyrouter/pepper-keyrouter.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/keyrouter/pepper-keyrouter.c b/src/lib/keyrouter/pepper-keyrouter.c index 325c04c..2090d2b 100644 --- a/src/lib/keyrouter/pepper-keyrouter.c +++ b/src/lib/keyrouter/pepper-keyrouter.c @@ -716,6 +716,8 @@ pepper_keyrouter_create(pepper_compositor_t *compositor) global = wl_global_create(display, &tizen_keyrouter_interface, 2, pepper_keyrouter, _pepper_keyrouter_cb_bind); PEPPER_CHECK(global, goto failed, "Failed to create wl_global for tizen_keyrouter\n"); + pepper_keyrouter->global = global; + pepper_keyrouter->keyrouter = keyrouter_create(); PEPPER_CHECK(pepper_keyrouter->keyrouter, goto failed, "Failed to create keyrouter\n"); @@ -751,8 +753,6 @@ pepper_keyrouter_destroy(pepper_keyrouter_t *pepper_keyrouter) pepper_list_for_each_safe(rdata, rtmp, &pepper_keyrouter->resources, link) { wl_resource_destroy(rdata->resource); - pepper_list_remove(&rdata->link); - free(rdata); } if (pepper_keyrouter->keyrouter) { -- 2.34.1