From 204455afd21ed6a11f02a98d1e15c0a02c58c027 Mon Sep 17 00:00:00 2001 From: Marvin W Date: Wed, 22 Apr 2020 23:58:02 +0200 Subject: Fix rare issue with incorrect link parsing --- main/src/ui/util/helper.vala | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'main/src/ui/util') diff --git a/main/src/ui/util/helper.vala b/main/src/ui/util/helper.vala index 65318870..d5b5a2bb 100644 --- a/main/src/ui/util/helper.vala +++ b/main/src/ui/util/helper.vala @@ -281,10 +281,10 @@ public static string parse_add_markup(string s_, string? highlight_word, bool pa string s = s_; bool already_escaped = already_escaped_; - if (parse_links) { + if (parse_links && !already_escaped) { MatchInfo match_info; get_url_regex().match(s.down(), 0, out match_info); - if (match_info.matches()) { + while (match_info.matches()) { int start, end; match_info.fetch_pos(0, out start, out end); string link = s[start:end]; @@ -325,6 +325,7 @@ public static string parse_add_markup(string s_, string? highlight_word, bool pa "" + parse_add_markup(link, highlight_word, false, false, already_escaped) + "" + parse_add_markup(s[end:s.length], highlight_word, parse_links, parse_text_markup, already_escaped); } + match_info.next(); } } -- cgit v1.2.3-54-g00ecf