From 2b3bba1f7e8bb070ead2147b311237d04ddad43d Mon Sep 17 00:00:00 2001 From: Daniel Hirt Date: Mon, 27 Jun 2016 15:16:50 +0000 Subject: [PATCH] Canvas text: fix format annotations deletion --- src/lib/evas/canvas/evas_object_textblock.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index d331bc5..e0130b7 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -9006,19 +9006,17 @@ _evas_textblock_node_format_remove_matching(Efl_Canvas_Text_Data *o, if (_FORMAT_IS_CLOSER_OF( fnode->orig_format, fstr + 1, fstr_len - 1)) { - Eina_Bool have_annotation = !!fmt->annotation; + Efl_Canvas_Text_Annotation *an = fmt->annotation; fnode = eina_list_data_get(i); formats = eina_list_remove_list(formats, i); _evas_textblock_node_format_remove(o, fnode, 0); _evas_textblock_node_format_remove(o, fmt, 0); - /* Only matching format nodes may be the result - * of an annotation. */ - if (have_annotation) + if (an) { _evas_textblock_annotation_remove( - o, fmt->annotation, EINA_FALSE); + o, an, EINA_FALSE); } break; } -- 2.7.4