From fd23a2a3af3bd6b533ea6a11c2e1d2e2ce7136db Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Mon, 3 Sep 2012 13:55:20 +0000 Subject: [PATCH] Elm layout: Revert "Elm layout: Fix segfault in some cases." This reverts commit 76000. Many thanks to glima for spanking me back into the right path. SVN revision: 76012 --- legacy/elementary/src/lib/elm_layout.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/legacy/elementary/src/lib/elm_layout.c b/legacy/elementary/src/lib/elm_layout.c index 278e9c3fcf..81e7e323e0 100644 --- a/legacy/elementary/src/lib/elm_layout.c +++ b/legacy/elementary/src/lib/elm_layout.c @@ -70,7 +70,7 @@ _elm_layout_smart_sizing_eval(Evas_Object *obj) { ELM_LAYOUT_DATA_GET(obj, sd); - if (!sd || sd->needs_size_calc) return; + if (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 (!sd || ELM_WIDGET_DATA(sd)->frozen) return; + if (ELM_WIDGET_DATA(sd)->frozen) return; ELM_LAYOUT_CLASS(ELM_WIDGET_DATA(sd)->api)->sizing_eval(data); }