summaryrefslogtreecommitdiff
path: root/src/bin/e_shelf.c
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2012-10-18 07:39:02 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2012-10-18 07:39:02 +0000
commit23f35193cf6bcc76e326b3d45971da8bbf5f7451 (patch)
tree255fe7f46e0414269e17649d5bf65f2d0a85010a /src/bin/e_shelf.c
parente01c5b9946f3fc88c04a8bf1d5eb0af81cead14b (diff)
downloadenlightenment-23f35193cf6bcc76e326b3d45971da8bbf5f7451.tar.gz
fix shelf crash from ticket #1635
SVN revision: 78152
Diffstat (limited to 'src/bin/e_shelf.c')
-rw-r--r--src/bin/e_shelf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c
index fbc2e5a1cd..69c3b3e576 100644
--- a/src/bin/e_shelf.c
+++ b/src/bin/e_shelf.c
@@ -464,7 +464,7 @@ e_shelf_toggle(E_Shelf *es, int show)
ecore_animator_add(_e_shelf_cb_hide_animator, es);
}
}
- else if ((!show) && (!es->hidden) && (!es->gadcon->editing) &&
+ else if ((!show) && (!es->hidden) && ((!es->gadcon) || (!es->gadcon->editing)) &&
(es->cfg->autohide))
{
edje_object_signal_emit(es->o_base, "e,state,hidden", "e");