summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-08-19 13:38:15 -0400
committerCedric BAIL <cedric.bail@free.fr>2019-08-19 16:47:04 -0700
commit1948bf0d077a14a487bafc47da393532ed04c0e4 (patch)
treeaa28f2d169a9ca04af736dd4899fe1c3a055e44c /src
parent945447d1f8531ea4d9e744d7c46427b0a4cb0ca8 (diff)
downloadefl-1948bf0d077a14a487bafc47da393532ed04c0e4.tar.gz
elm/hoversel: avoid calling api functions on null hoversel objects
the hoversel must be created before it can be shown, and its internal hover object may be destroyed when it is hidden @fix Reviewed-by: Cedric BAIL <cedric.bail@free.fr> Differential Revision: https://phab.enlightenment.org/D9631
Diffstat (limited to 'src')
-rw-r--r--src/lib/elementary/elc_hoversel.c3
-rw-r--r--src/lib/elementary/elm_entry.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c
index b882b87833..dfdb638892 100644
--- a/src/lib/elementary/elc_hoversel.c
+++ b/src/lib/elementary/elc_hoversel.c
@@ -678,7 +678,8 @@ _elm_hoversel_efl_gfx_entity_visible_set(Eo *obj, Elm_Hoversel_Data *sd, Eina_Bo
return;
efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), vis);
- efl_gfx_entity_visible_set(sd->hover, vis);
+ if (sd->hover)
+ efl_gfx_entity_visible_set(sd->hover, vis);
}
EOLIAN static void
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index 1fa1a9096a..94ce3c5391 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -1811,8 +1811,8 @@ _menu_call(Evas_Object *obj)
if (sd->hoversel)
{
_hoversel_position(obj);
- evas_object_show(sd->hoversel);
elm_hoversel_hover_begin(sd->hoversel);
+ evas_object_show(sd->hoversel);
}
if (!_elm_config->desktop_entry)