From 2d15bd30d76e1913d0d52d84cf654e4133605169 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 4 Feb 2024 21:04:16 +0300 Subject: SmileyAdd: we don't call ME_SMILEYADD_OPTIONSCHANGED when nothing was really changed --- plugins/SmileyAdd/src/customsmiley.cpp | 2 +- plugins/SmileyAdd/src/services.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'plugins/SmileyAdd') diff --git a/plugins/SmileyAdd/src/customsmiley.cpp b/plugins/SmileyAdd/src/customsmiley.cpp index 29cbc02de8..40a76c7123 100644 --- a/plugins/SmileyAdd/src/customsmiley.cpp +++ b/plugins/SmileyAdd/src/customsmiley.cpp @@ -120,7 +120,7 @@ bool SmileyPackCType::LoadSmiley(const wchar_t *path) for (auto &it : m_SmileyList) if (it->GetTriggerText() == name) { it->LoadFromResource(dirs, 0); - return true; + return false; } m_SmileyList.insert(new SmileyCType(dirs, (wchar_t*)name.c_str())); diff --git a/plugins/SmileyAdd/src/services.cpp b/plugins/SmileyAdd/src/services.cpp index 123135259e..efc8e2cb10 100644 --- a/plugins/SmileyAdd/src/services.cpp +++ b/plugins/SmileyAdd/src/services.cpp @@ -344,8 +344,8 @@ static INT_PTR LoadContactSmileys(WPARAM, LPARAM lParam) break; case SMADD_FILE: - g_SmileyPackCStore.AddSmiley(cont->pszModule, cont->path); - NotifyEventHooks(g_hevOptionsChanged, 0, (WPARAM)cont->pszModule); + if (g_SmileyPackCStore.AddSmiley(cont->pszModule, cont->path)) + NotifyEventHooks(g_hevOptionsChanged, 0, (WPARAM)cont->pszModule); break; case SMADD_FOLDER: -- cgit v1.2.3