aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBoris Faure <billiob@gmail.com>2018-12-23 10:22:08 +0100
committerBoris Faure <billiob@gmail.com>2018-12-23 10:22:08 +0100
commitddef1ec5159d9aa8ee82f6ab1c80854828e6d2b2 (patch)
tree6fdba83282827e1d7bf2cac460bca2235aa6a523 /src
parenttermio: fix use of uninitialized variable (diff)
parenttermio: fix potential segv. CID1397077 (diff)
downloadterminology-ddef1ec5159d9aa8ee82f6ab1c80854828e6d2b2.tar.gz
Merge remote-tracking branch 'origin/terminology-1.3'
Diffstat (limited to 'src')
-rw-r--r--src/bin/termio.c27
1 files changed, 14 insertions, 13 deletions
diff --git a/src/bin/termio.c b/src/bin/termio.c
index ae645b4..36e3679 100644
--- a/src/bin/termio.c
+++ b/src/bin/termio.c
@@ -1156,19 +1156,6 @@ _cb_link_down(void *data,
ctxp = elm_ctxpopup_add(sd->win);
sd->ctxpopup = ctxp;
- if (sd->config->helper.inline_please)
- {
- Media_Type type = media_src_type_get(sd->link.string);
-
- if ((type == MEDIA_TYPE_IMG) ||
- (type == MEDIA_TYPE_SCALE) ||
- (type == MEDIA_TYPE_EDJE) ||
- (type == MEDIA_TYPE_MOV))
- elm_ctxpopup_item_append(ctxp, _("Preview"), NULL,
- _cb_ctxp_link_preview, sd->self);
- }
- elm_ctxpopup_item_append(ctxp, _("Open"), NULL, _cb_ctxp_link_open,
- sd->self);
if (hl)
{
raw_link = hl->url;
@@ -1188,6 +1175,20 @@ _cb_link_down(void *data,
if (len > 0 && raw_link[0] == '/')
absolut = EINA_TRUE;
+ if (sd->config->helper.inline_please)
+ {
+ Media_Type type = media_src_type_get(raw_link);
+
+ if ((type == MEDIA_TYPE_IMG) ||
+ (type == MEDIA_TYPE_SCALE) ||
+ (type == MEDIA_TYPE_EDJE) ||
+ (type == MEDIA_TYPE_MOV))
+ elm_ctxpopup_item_append(ctxp, _("Preview"), NULL,
+ _cb_ctxp_link_preview, sd->self);
+ }
+ elm_ctxpopup_item_append(ctxp, _("Open"), NULL, _cb_ctxp_link_open,
+ sd->self);
+
if (!absolut &&
!link_is_url(raw_link) &&
!link_is_email(raw_link))