diff options
| author | Jiwoong Im <jiwoong.im@samsung.com> | 2015-08-07 15:39:06 +0900 |
|---|---|---|
| committer | Jiwoong Im <jiwoong.im@samsung.com> | 2015-08-07 16:51:01 +0900 |
| commit | 6579f394a4eb32852cba637c38bcc74e9f9dbdb0 (patch) | |
| tree | 9a144ce9e5d9336307a5ad608de7f0e4be623c39 | |
| parent | 1c618744e2307a96b8602bcac3ed40d4ae1abe52 (diff) | |
| download | app-core-submit/tizen/20150813.130512.tar.gz app-core-submit/tizen/20150813.130512.tar.bz2 app-core-submit/tizen/20150813.130512.zip | |
modify code related to app life-cycle.submit/tizen_mobile/20150812.025625submit/tizen/20150813.130512submit/tizen/20150811.103743accepted/tizen/wearable/20150814.011850accepted/tizen/tv/20150814.011703accepted/tizen/mobile/20150814.011524
- fix bug in calling resume_cb at first launch.
- call pause_cb before terminate_cb
Change-Id: Ief34871cb6c465844a49046e24e5f6a472c2f55f
Signed-off-by: Jiwoong Im <jiwoong.im@samsung.com>
| -rw-r--r-- | src/appcore-efl.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/appcore-efl.c b/src/appcore-efl.c index 713c39e..cffd294 100644 --- a/src/appcore-efl.c +++ b/src/appcore-efl.c @@ -252,9 +252,13 @@ static void __do_app(enum app_event event, void *data, bundle * b) if (!(ui->state == AS_PAUSED && event == AE_PAUSE)) __appcore_timer_del(ui); + if (ui->state == AS_DYING) { + _ERR("Skip the event in dying state"); + return; + } + if (event == AE_TERMINATE) { _DBG("[APP %d] TERMINATE", _pid); - ui->state = AS_DYING; elm_exit(); return; } @@ -325,9 +329,10 @@ static void __do_app(enum app_event event, void *data, bundle * b) ui->pending_data = NULL; } else { appcore_group_resume(); - if (ui->ops->resume) { - ui->ops->resume(ui->ops->data); - } + } + + if (ui->ops->resume) { + ui->ops->resume(ui->ops->data); } ui->state = AS_RUNNING; } @@ -833,6 +838,8 @@ static void __after_loop(struct ui_priv *ui) if (ui->ops && ui->ops->terminate) ui->ops->terminate(ui->ops->data); + ui->state = AS_DYING; + if (ui->hshow) ecore_event_handler_del(ui->hshow); if (ui->hhide) |