From 1f781d6806e0d869197d898298d7bac2c3db8229 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Mon, 24 Aug 2020 16:22:42 +0300
Subject: SmileyAdd: regression with metacontacts handling fixed

---
 plugins/SmileyAdd/src/dlgboxsubclass.cpp | 2 +-
 plugins/SmileyAdd/src/services.cpp       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'plugins/SmileyAdd/src')

diff --git a/plugins/SmileyAdd/src/dlgboxsubclass.cpp b/plugins/SmileyAdd/src/dlgboxsubclass.cpp
index 315ea88f36..6d37f6e936 100644
--- a/plugins/SmileyAdd/src/dlgboxsubclass.cpp
+++ b/plugins/SmileyAdd/src/dlgboxsubclass.cpp
@@ -33,7 +33,7 @@ struct MsgWndData : public MZeroedObject
 
 	void CreateSmileyButton(void)
 	{
-		SmileyPackType *SmileyPack = FindSmileyPack(ProtocolName);
+		SmileyPackType *SmileyPack = FindSmileyPack(ProtocolName, hContact);
 		bool doSmileyButton = SmileyPack != nullptr && SmileyPack->VisibleSmileyCount() != 0;
 
 		doSmileyReplace = true;
diff --git a/plugins/SmileyAdd/src/services.cpp b/plugins/SmileyAdd/src/services.cpp
index e238b75ba5..aace81df1c 100644
--- a/plugins/SmileyAdd/src/services.cpp
+++ b/plugins/SmileyAdd/src/services.cpp
@@ -26,6 +26,7 @@ LIST<void> menuHandleArray(5);
 
 SmileyPackType* FindSmileyPack(const char *proto, MCONTACT hContact, SmileyPackCType **smlc)
 {
+	hContact = DecodeMetaContact(hContact);
 	if (smlc)
 		*smlc = g_SmileyPackCStore.GetSmileyPack(proto);
 
-- 
cgit v1.2.3