From: Woochan Lee <wc0917.lee@samsung.com>
Date: Tue, 10 May 2016 05:43:36 +0000 (+0900)
Subject: Prevent pop action when effect on going.
X-Git-Tag: submit/tizen/20160617.075742~36^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ce4cd4c612a55f754fd09dfd9dac8650032d408a;p=platform%2Fcore%2Fuifw%2Fui-viewmgr.git

Prevent pop action when effect on going.

Change-Id: I97eeb8decf4731019d1df8b830ce90393287de19
---

diff --git a/src/lib/efl/mobile/ui_view.cpp b/src/lib/efl/mobile/ui_view.cpp
index 3cbc0c7..6bbd8a2 100644
--- a/src/lib/efl/mobile/ui_view.cpp
+++ b/src/lib/efl/mobile/ui_view.cpp
@@ -88,10 +88,10 @@ bool ui_view_impl::on_back()
 {
 	//If any popup is activated, deactivate the popup first.
 	if (this->deactivate_popup(true))
-		{
+	{
 		return false;
+	}
 
-		}
 	if (this->menu)
 	{
 		if (this->menu->is_activated())
diff --git a/src/lib/interface/ui_iface_viewmgr.cpp b/src/lib/interface/ui_iface_viewmgr.cpp
index 36a5964..bbe8254 100644
--- a/src/lib/interface/ui_iface_viewmgr.cpp
+++ b/src/lib/interface/ui_iface_viewmgr.cpp
@@ -248,6 +248,14 @@ ui_iface_view *ui_iface_viewmgr_impl::push_view(ui_iface_view *view)
 
 bool ui_iface_viewmgr_impl::pop_view()
 {
+	//last page to be popped.
+	ui_iface_view*view = this->view_list.back();
+
+	if (view->get_event_block())
+	{
+		return false;
+	}
+
 	//FIXME: No more view?
 	if (this->get_view_count() == 0)
 	{
@@ -268,8 +276,6 @@ bool ui_iface_viewmgr_impl::pop_view()
 		return true;
 	}
 
-	//last page to be popped.
-	ui_iface_view*view = this->view_list.back();
 	view->on_deactivate();
 	this->set_event_block(view, true);