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 3cbc0c75f998ad501ded352546557e1c245ae0d1..6bbd8a22c9cf3c4904c0f75a5165faa94dd85547 100644 (file)
--- 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 36a59647b9a987fd50c6293032ec68f97f4d5496..bbe825457a9ab7679d363ceffe4a209df1b2fcd8 100644 (file)
--- 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);