Fix crash in Chooser with groups caused by failure to identify ChooserView

as Naviframe.

Change-Id: Ib70121ddb6f2c7df358dce255d676edaf1f08eb2
Signed-off-by: Eugene Kurzberg <i.kurtsberg@samsung.com>

diff --git a/lib-apps-common/inc/Ui/Naviframe.h b/lib-apps-common/inc/Ui/Naviframe.h
index 137c06c28f88e672be10c69a963482f89e0633ae..de7c2a291824653ebf4ddce722848c1795d6b624 100644 (file)
--- a/lib-apps-common/inc/Ui/Naviframe.h
+++ b/lib-apps-common/inc/Ui/Naviframe.h
@@ -29,6 +29,8 @@ namespace Ui
        class EXPORT_API Naviframe : public Navigator
        {
        public:
+               DEFINE_CLASS_TYPE(Naviframe, Navigator)
+
                Naviframe();
 
                /**

diff --git a/lib-apps-common/src/Ui/View.cpp b/lib-apps-common/src/Ui/View.cpp
index 72f1af32975db60b05b7d898d5a9dcc563ac9659..dbbecbf2f51bc21656f1b0b01fb24fa2bfb05ec8 100644 (file)
--- a/lib-apps-common/src/Ui/View.cpp
+++ b/lib-apps-common/src/Ui/View.cpp
@@ -27,7 +27,8 @@ View::View()
 
 Navigator *View::getNavigator() const
 {
-       return findParent<Navigator>();
+       Evas_Object *parent = elm_object_parent_widget_get(getEvasObject());
+       return findParent<Navigator>(parent);
 }
 
 NavigatorPage *View::getPage() const