summaryrefslogtreecommitdiff
path: root/plugins/SmileyAdd/src/smileys.cpp
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2018-05-16 12:57:09 +0300
committerGeorge Hazan <ghazan@miranda.im>2018-05-16 12:57:09 +0300
commit12c0a01bc1826949fa9e146b668a400cab679a63 (patch)
tree2dc6768537cf0de4ce2a7a79b86c3a08f3c8af1e /plugins/SmileyAdd/src/smileys.cpp
parent40086f4fc370ca92218c805fe5cee10c09f57f2c (diff)
merge with master till
IRC fixes #1342 (broken search in channel browser);
Diffstat (limited to 'plugins/SmileyAdd/src/smileys.cpp')
-rw-r--r--plugins/SmileyAdd/src/smileys.cpp2
1 files changed, 1 insertions, 1 deletions
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));