From b48cb64859d33cb2092f66b1eed42c9234ee1d7f Mon Sep 17 00:00:00 2001 From: "shoum.chen@samsung.com" Date: Tue, 9 Jun 2015 10:49:22 +0800 Subject: [PATCH] Fix the prevent bugs. Change-Id: If3f22ab393064ffda4a9cb98486f8bf3b3c7fc34 Signed-off-by: shoum.chen@samsung.com --- im_setting_selector/input_method_setting_selector_ui.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/im_setting_selector/input_method_setting_selector_ui.cpp b/im_setting_selector/input_method_setting_selector_ui.cpp index 29f257e..bc9c63d 100644 --- a/im_setting_selector/input_method_setting_selector_ui.cpp +++ b/im_setting_selector/input_method_setting_selector_ui.cpp @@ -97,7 +97,7 @@ static void im_setting_selector_load_ime_info(void) { g_ime_info_list.push_back(info[i]); nIndex ++; - if(!strcmp(active_ime_appid, info[i].appid)) + if(active_ime_appid && (!strcmp(active_ime_appid, info[i].appid))) { g_active_ime_id = nIndex; } @@ -105,6 +105,10 @@ static void im_setting_selector_load_ime_info(void) } free(info); } + if(active_ime_appid) + { + free(active_ime_appid); + } } static void im_setting_selector_show_ime_list(void) @@ -336,6 +340,7 @@ Evas_Object *im_setting_selector_popup_create(void *data) elm_object_content_set(ad->popup, ad->genlist); evas_object_show(ad->popup); + return ad->popup; } void -- 2.7.4