summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunghoon Park <jh9216.park@samsung.com>2016-06-21 14:55:56 +0900
committerJunghoon Park <jh9216.park@samsung.com>2016-06-21 14:55:56 +0900
commitd1fa59bb255a323ad993dc9e01abe342aaf6291b (patch)
tree1e09c79b1696fd4722a065748993f9675a56bd5d
parentb471207fdecc3f2bf902bbed13fbb044c77d2bc8 (diff)
downloadlaunchpad-d1fa59bb255a323ad993dc9e01abe342aaf6291b.tar.gz
launchpad-d1fa59bb255a323ad993dc9e01abe342aaf6291b.tar.bz2
launchpad-d1fa59bb255a323ad993dc9e01abe342aaf6291b.zip
Change-Id: I8550b50c6fed43e8aa704fcf3b895d09ad82b43d Signed-off-by: Junghoon Park <jh9216.park@samsung.com>
-rwxr-xr-xsrc/launchpad.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/launchpad.c b/src/launchpad.c
index 86b7bde..cf7514b 100755
--- a/src/launchpad.c
+++ b/src/launchpad.c
@@ -831,12 +831,6 @@ static gboolean __handle_label_monitor(gpointer data)
while (iter) {
cpc = (candidate_process_context_t *)iter->data;
if (cpc->prepared) {
- _D("Dispose candidate process %d", cpc->pid);
- __kill_process(cpc->pid);
- close(cpc->send_fd);
- cpc->prepared = false;
- cpc->pid = CANDIDATE_NONE;
- cpc->send_fd = -1;
if (cpc->source > 0) {
g_source_remove(cpc->source);
cpc->source = 0;
@@ -846,7 +840,13 @@ static gboolean __handle_label_monitor(gpointer data)
g_source_remove(cpc->timer);
cpc->timer = 0;
}
- __set_timer(cpc);
+
+ _D("Dispose candidate process %d", cpc->pid);
+ __kill_process(cpc->pid);
+ close(cpc->send_fd);
+ cpc->prepared = false;
+ cpc->pid = CANDIDATE_NONE;
+ cpc->send_fd = -1;
__prepare_candidate_process(cpc->type, cpc->loader_id);
}