From 12c0a01bc1826949fa9e146b668a400cab679a63 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 16 May 2018 12:57:09 +0300 Subject: merge with master till IRC fixes #1342 (broken search in channel browser); --- plugins/SmileyAdd/src/smileys.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/SmileyAdd/src') diff --git a/plugins/SmileyAdd/src/smileys.cpp b/plugins/SmileyAdd/src/smileys.cpp index 6c19d195f0..570b15469b 100644 --- a/plugins/SmileyAdd/src/smileys.cpp +++ b/plugins/SmileyAdd/src/smileys.cpp @@ -470,7 +470,7 @@ bool SmileyPackType::LoadSmileyFileXEP(CMStringW &tbuf, bool onlyInfo) SmileyType *dat = new SmileyType; dat->SetRegEx(true); dat->SetImList(m_hSmList, _wtoi(pStr)); - dat->m_ToolText = xmlGetText(nRec); + dat->m_ToolText = FilterQuotes(xmlGetText(nRec)); if (node = xmlGetChildByPath(nRec, L"Expression", 0)) dat->m_TriggerText = FilterQuotes(xmlGetText(node)); -- cgit v1.2.3