Set the environments before calling launch callback

Change-Id: I909f764a61f3dd781ab4ac8c8fd7b2077d804bfc
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>

diff --git a/src/launchpad_lib.c b/src/launchpad_lib.c
index 97b8e9e..c476fb9 100644 (file)
--- a/src/launchpad_lib.c
+++ b/src/launchpad_lib.c
@@ -214,6 +214,9 @@ static int __candidate_process_launchpad_main_loop(app_pkt_t *pkt,
 
        SECURE_LOGD("pkg id: %s", menu_info->pkgid);
 
+       /* Set environments */
+       _set_env(menu_info, kb);
+
        tmp_argv = _create_argc_argv(kb, &tmp_argc);
 
        __default_launch_cb(kb, menu_info->appid, app_path,
@@ -226,9 +229,6 @@ static int __candidate_process_launchpad_main_loop(app_pkt_t *pkt,
                                menu_info->pkg_type, __loader_user_data);
        }
 
-       /* SET ENVIROMENT*/
-       _set_env(menu_info, kb);
-
        if (out_app_path != NULL && out_argc != NULL && out_argv != NULL) {
                memset(out_app_path, '\0', strlen(out_app_path));
                snprintf(out_app_path, LOADER_ARG_LEN, "%s", app_path);