Elementary widget: Fixed NULL checking in elm_widget_show_region_set
authortasn <tasn@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Thu, 17 Mar 2011 12:10:02 +0000 (12:10 +0000)
committertasn <tasn@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Thu, 17 Mar 2011 12:10:02 +0000 (12:10 +0000)
Patch by WooHyun Jung.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@57823 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

src/lib/elm_widget.c

index 2e6271b..6d766bb 100644 (file)
@@ -1674,10 +1674,10 @@ elm_widget_show_region_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Co
    do
      {
         parent_obj = sd->parent_obj;
-        child_obj = sd->obj;
+        if ((!parent_obj) || (!_elm_widget_is(parent_obj))) break;
         sd = evas_object_smart_data_get(parent_obj);
-
-        if ((!parent_obj) || (!sd) || (!_elm_widget_is(parent_obj))) break;
+        if (!sd) break;
+        child_obj = sd->obj;
 
         evas_object_geometry_get(parent_obj, &px, &py, NULL, NULL);
         evas_object_geometry_get(child_obj, &cx, &cy, NULL, NULL);