From 69fd667603b8d71926cfdfbd5a837543dba0a05c Mon Sep 17 00:00:00 2001 From: Sungmin Kwak Date: Wed, 6 Sep 2017 17:17:15 +0900 Subject: [PATCH] Delete the timer callback when destroying WSCContextISF pointer The 2-second timer callback is used to prevent Remote input after Local input. The pointer parameter to this callback can be invalid if the context is deleted. Change-Id: I2c63ca6474ab662cdc0a2957afbde1890856e3dc --- ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp b/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp index 2f699c6..b0a5e16 100644 --- a/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp +++ b/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp @@ -747,6 +747,10 @@ wl_im_destroy () wsc_ctx->autocapital_type_initialized = EINA_FALSE; wsc_ctx->language_initialized = EINA_FALSE; + if (_resource_check_timer) + ecore_timer_del (_resource_check_timer); + _resource_check_timer = NULL; + isf_wsc_context_del (wsc_ctx); delete wsc_ctx; _wl_im_ctx->wsc->wsc_ctx = NULL; -- 2.7.4