3 files changed, 5 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 7470f468c..7c7bfea4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
         * fixed bug where pointer warping to new clients would start at a random location
         * fix crash when locking screen from Start gadget and then activating gadget again
+        * fixed bug where e_layout would ignore frozen state and crash
 
 2013-02-08 Cedric Bail
 
diff --git a/NEWS b/NEWS
index ad28cbb5a..387ea311c 100644
--- a/NEWS
+++ b/NEWS
@@ -33,6 +33,7 @@ Fixes:
     * don't call efreet_menu_parse from a thread
     * fixed bug where pointer warping to new clients would start at a random location
     * fix crash when locking screen from Start gadget and then activating gadget again
+    * fixed bug where e_layout would ignore frozen state and crash
 
 
 Changes since 0.17.0:
diff --git a/src/bin/e_layout.c b/src/bin/e_layout.c
index 837100da5..43008378d 100644
--- a/src/bin/e_layout.c
+++ b/src/bin/e_layout.c
@@ -151,7 +151,7 @@ e_layout_child_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
    if ((li->x == x) && (li->y == y)) return;
    li->x = x;
    li->y = y;
-   _e_layout_smart_move_resize_item(li);
+   if (li->sd->frozen <= 0) _e_layout_smart_move_resize_item(li);
 }
 
 EAPI void
@@ -166,7 +166,7 @@ e_layout_child_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
    if ((li->w == w) && (li->h == h)) return;
    li->w = w;
    li->h = h;
-   _e_layout_smart_move_resize_item(li);
+   if (li->sd->frozen <= 0) _e_layout_smart_move_resize_item(li);
 }
 
 EAPI void
@@ -452,7 +452,7 @@ _e_layout_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
    sd->w = w;
    sd->h = h;
    sd->changed = 1;
-   _e_layout_smart_reconfigure(sd);
+   if (sd->frozen <= 0) _e_layout_smart_reconfigure(sd);
 }
 
 static void