From 0082b4df1cab5c1b1a97a98fc27f6f58a2ebd083 Mon Sep 17 00:00:00 2001 From: YoungHun Cho Date: Mon, 5 Dec 2016 11:28:00 +0900 Subject: [PATCH] app resuem crash & add elm_lang_set Change-Id: I3455ac875cf9616bf41b9af1b183820cf720d4f8 Signed-off-by: YoungHun Cho --- src/apps_view.c | 19 +++++++++++-------- src/homescreen-efl.c | 7 +++++++ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/apps_view.c b/src/apps_view.c index ba9fbc6..cf2ecc1 100755 --- a/src/apps_view.c +++ b/src/apps_view.c @@ -813,17 +813,20 @@ static void __apps_view_icon_clicked_cb(void *data, Evas_Object *obj, const char } bool is_running = false; - app_manager_is_running(item->app_id, &is_running); - if (is_running) { - app_context_h context; - app_manager_get_app_context(item->app_id, &context); - if (app_manager_resume_app(context) != APP_MANAGER_ERROR_NONE) { + if (app_manager_is_running(item->app_id, &is_running) == APP_MANAGER_ERROR_NONE) { + if (is_running) { + LOGD("%s app is running", item->app_id); + + app_context_h context = NULL; + if (app_manager_get_app_context(item->app_id, &context) == APP_MANAGER_ERROR_NONE && + app_manager_resume_app(context) == APP_MANAGER_ERROR_NONE) { + if (context) app_context_destroy(context); + goto __ret; + } + LOGE("[FAILED][app_manager_resume_app]"); app_context_destroy(context); - goto __ret; } - app_context_destroy(context); - goto __ret; } if (app_control_send_launch_request(app_control_handle, NULL, NULL) != APP_CONTROL_ERROR_NONE) { diff --git a/src/homescreen-efl.c b/src/homescreen-efl.c index 00737d0..7ab0b93 100755 --- a/src/homescreen-efl.c +++ b/src/homescreen-efl.c @@ -79,6 +79,13 @@ static void __homescreen_efl_lang_changed_cb(app_event_info_h event_info, void * menu_hide(); cluster_view_lang_changed(main_info.view_type); apps_view_lang_changed(main_info.view_type); + + char *lang = NULL; + app_event_get_language(event_info, &lang); + if (lang) { + elm_language_set(lang); + free(lang); + } } static void __homescreen_efl_orient_changed_cb(app_event_info_h event_info, void *user_data) -- 2.7.4