From 9f97ee7d2567012676dbd30729b0e64679428398 Mon Sep 17 00:00:00 2001 From: doitux Date: Wed, 26 Dec 2012 13:51:17 +0100 Subject: [PATCH] BUGFIX: Emoticons breaks URLs in the chat (#163) --- src/gui/qt/chattools/chattools.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/gui/qt/chattools/chattools.cpp b/src/gui/qt/chattools/chattools.cpp index 2133a9d0..0d61c736 100644 --- a/src/gui/qt/chattools/chattools.cpp +++ b/src/gui/qt/chattools/chattools.cpp @@ -354,7 +354,12 @@ QString ChatTools::checkForEmotes(QString msg) msg.replace(":-O", ""); msg.replace(":-o", ""); msg.replace(":-/", ""); - msg.replace(":/", ""); + + //prevent links from beeing broken by :/ emoticon + if(!msg.contains("http://") && !msg.contains("https://")) { + msg.replace(":/", ""); + } + msg.replace(";-)", ""); msg.replace(";)", ""); msg.replace(":-S", "");