summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2013-09-05 10:09:27 +0100
committerMike Blumenkrantz <zmike@samsung.com>2014-01-13 01:14:15 -0500
commitf6172126433ce051618bf295f1a761ff45c7b7d6 (patch)
tree4feaf2efbc8173b64d556bfebdef34f9e4436965
parent7054311f5097a06464025ffd7374529c5cc2263d (diff)
downloadenlightenment-f6172126433ce051618bf295f1a761ff45c7b7d6.tar.gz
nosquash: don't recalc a gadcon on unpack if we're stopping, also don't recalc gadcons during stop when unpopulating
this caused a lot of slowdown, and even possible crashes, during restarts
-rw-r--r--src/bin/e_gadcon.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c
index 9920633961..f2d60316b6 100644
--- a/src/bin/e_gadcon.c
+++ b/src/bin/e_gadcon.c
@@ -611,7 +611,7 @@ e_gadcon_unpopulate(E_Gadcon *gc)
if (gc->awaiting_classes)
eina_hash_free(gc->awaiting_classes);
gc->awaiting_classes = NULL;
- if (gc->o_container) e_gadcon_layout_thaw(gc->o_container);
+ if (gc->o_container && (!stopping)) e_gadcon_layout_thaw(gc->o_container);
}
EAPI void
@@ -3765,7 +3765,8 @@ e_gadcon_layout_unpack(Evas_Object *obj)
if (!sd) return;
sd->items = eina_list_remove(sd->items, obj);
_e_gadcon_layout_smart_disown(obj);
- _e_gadcon_layout_smart_reconfigure(sd);
+ if (!stopping)
+ _e_gadcon_layout_smart_reconfigure(sd);
}
/* local subsystem functions */