Elm layout: Fix segfault in some cases.
authorTom Hacohen <tom@stosb.com>
Mon, 3 Sep 2012 11:14:17 +0000 (11:14 +0000)
committerTom Hacohen <tom@stosb.com>
Mon, 3 Sep 2012 11:14:17 +0000 (11:14 +0000)
Apparently this fixes stuff for Daniel Zaoui with some more complicated cases.

SVN revision: 76000

src/lib/elm_layout.c

index 81e7e32..278e9c3 100644 (file)
@@ -70,7 +70,7 @@ _elm_layout_smart_sizing_eval(Evas_Object *obj)
 {
    ELM_LAYOUT_DATA_GET(obj, sd);
 
-   if (sd->needs_size_calc) return;
+   if (!sd || sd->needs_size_calc) return;
    sd->needs_size_calc = EINA_TRUE;
 
    evas_object_smart_changed(obj);
@@ -83,7 +83,7 @@ _on_sub_object_size_hint_change(void *data,
                                 void *event_info __UNUSED__)
 {
    ELM_LAYOUT_DATA_GET(data, sd);
-   if (ELM_WIDGET_DATA(sd)->frozen) return;
+   if (!sd || ELM_WIDGET_DATA(sd)->frozen) return;
    ELM_LAYOUT_CLASS(ELM_WIDGET_DATA(sd)->api)->sizing_eval(data);
 }