diff options
| author | George Hazan <ghazan@miranda.im> | 2020-08-24 16:22:42 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2020-08-24 16:22:42 +0300 |
| commit | 1f781d6806e0d869197d898298d7bac2c3db8229 (patch) | |
| tree | f990514523ebf821ce61efceeda6163f59b6f3b2 | |
| parent | c4fab6727381c5d89b377aa1c4dc2e3a037c1738 (diff) | |
SmileyAdd: regression with metacontacts handling fixed
| -rw-r--r-- | plugins/SmileyAdd/src/dlgboxsubclass.cpp | 2 | ||||
| -rw-r--r-- | plugins/SmileyAdd/src/services.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
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);
|