summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaehyun Cho <jae_hyun.cho@samsung.com>2017-09-06 20:03:26 +0900
committerJaehyun Cho <jae_hyun.cho@samsung.com>2017-09-06 20:35:35 +0900
commit26bacce0fd117896be65ebd75db4fed433529bd1 (patch)
tree02387ade854f1ccc2c859f9dd12b3bcf4473586f
parent2f6e28881ec6f7f4c3157f7bb4202f37ded06aa7 (diff)
downloadefl-26bacce0fd117896be65ebd75db4fed433529bd1.tar.gz
Revert "naviframe: Fix to finish transition for newly pushed item"
This reverts commit 8574128b67d336e796ca0f0abc9b97e65f7799d4.
-rw-r--r--src/lib/elementary/elc_naviframe.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c
index a6d8f61eb2..cd53e7aebe 100644
--- a/src/lib/elementary/elc_naviframe.c
+++ b/src/lib/elementary/elc_naviframe.c
@@ -627,10 +627,11 @@ end:
* This case can happen when an item is deleted by elm_object_item_del()
* right after the item is newly pushed.
*/
- if (nit == nfo->self)
- nfo->self = NULL;
- else if (nit == nfo->related)
- nfo->related = NULL;
+ if ((nfo->self == nit) || (nfo->related == nit))
+ {
+ nfo->self = NULL;
+ nfo->related = NULL;
+ }
}
_item_free(nit);