diff options
| author | Hwankyu Jhun <h.jhun@samsung.com> | 2020-07-27 13:02:04 +0900 |
|---|---|---|
| committer | Hwankyu Jhun <h.jhun@samsung.com> | 2020-07-27 13:02:04 +0900 |
| commit | 988a3b8b6874fbc80255d12d388104502c72742a (patch) | |
| tree | bda8101890a074db9f56e4c6e22a146392a8088a | |
| parent | a932653212e6cb85367ddd87555daf465fc14fd8 (diff) | |
| parent | 9363cb876c3acf314125b86662b0171cb57530ea (diff) | |
| download | launchpad-submit/tizen_5.5/20200727.040218.tar.gz launchpad-submit/tizen_5.5/20200727.040218.tar.bz2 launchpad-submit/tizen_5.5/20200727.040218.zip | |
Merge branch 'tizen' into tizen_5.5submit/tizen_5.5_wearable_hotfix/20201026.184302submit/tizen_5.5/20200727.040218accepted/tizen/5.5/unified/wearable/hotfix/20201027.120821accepted/tizen/5.5/unified/20200729.230616tizen_5.5_wearable_hotfixaccepted/tizen_5.5_unified_wearable_hotfix
Change-Id: I976ae68920f6869089b514cfc612e2ab33210f89
| -rw-r--r-- | packaging/launchpad.spec | 2 | ||||
| -rw-r--r-- | src/launchpad/src/launchpad.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packaging/launchpad.spec b/packaging/launchpad.spec index dcf1061..a28cfde 100644 --- a/packaging/launchpad.spec +++ b/packaging/launchpad.spec @@ -1,6 +1,6 @@ Name: launchpad Summary: Launchpad for launching applications -Version: 0.15.11 +Version: 0.15.12 Release: 1 Group: Application Framework/Daemons License: Apache-2.0 diff --git a/src/launchpad/src/launchpad.c b/src/launchpad/src/launchpad.c index c665796..1b941b9 100644 --- a/src/launchpad/src/launchpad.c +++ b/src/launchpad/src/launchpad.c @@ -1488,7 +1488,7 @@ static bool __handle_hydra_event(int fd, io_condition_e cond, void *data) if (!cpc->prepared) { ret = __accept_candidate_process(fd, &client_fd, &client_pid, - cpc->pid); + cpc->hydra_pid); if (ret >= 0) { cpc->hydra_fd = client_fd; |