diff options
author | Marcus Fritzsch <marcus.fritzsch@xse.de> | 2014-07-22 11:00:09 +0200 |
---|---|---|
committer | Nobuhiko Tanibata <NOBUHIKO_TANIBATA@denso.co.jp> | 2014-08-12 22:15:14 +0900 |
commit | 297f22d5bc533ee3731df2b93ee2cd1ac2a2ab4d (patch) | |
tree | cafae43b1f6253021e23e2b5d5fce16c4ee889cf | |
parent | a4836946d0651f80116f808a0472028b82645731 (diff) | |
download | wayland-ivi-extension-297f22d5bc533ee3731df2b93ee2cd1ac2a2ab4d.tar.gz |
ilmCommon: fix destruction order of "components"
After display ownership is managed in ilmCommon, it is important
to destroy components in the reverse order they were created.
Signed-off-by: Marcus Fritzsch <marcus.fritzsch@xse.de>
-rw-r--r-- | ivi-layermanagement-api/ilmCommon/src/ilm_common.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ivi-layermanagement-api/ilmCommon/src/ilm_common.c b/ivi-layermanagement-api/ilmCommon/src/ilm_common.c index 45897b3..442dde7 100644 --- a/ivi-layermanagement-api/ilmCommon/src/ilm_common.c +++ b/ivi-layermanagement-api/ilmCommon/src/ilm_common.c @@ -69,8 +69,8 @@ ilm_initWithNativedisplay(t_ilm_nativedisplay nativedisplay) err = ilmControl_init(display); if (ILM_SUCCESS != err) { - gIlmCommonPlatformFunc.destroy(); ilmClient_destroy(); + gIlmCommonPlatformFunc.destroy(); return err; } @@ -86,8 +86,8 @@ ilm_isInitialized(void) ILM_EXPORT ilmErrorTypes ilm_destroy(void) { - ilmErrorTypes retVal = gIlmCommonPlatformFunc.destroy(); - ilmClient_destroy(); ilmControl_destroy(); // block until control thread is stopped + ilmClient_destroy(); + ilmErrorTypes retVal = gIlmCommonPlatformFunc.destroy(); return retVal; } |