diff options
Diffstat (limited to 'plugins/SmileyAdd/src/smileys.cpp')
| -rw-r--r-- | plugins/SmileyAdd/src/smileys.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/plugins/SmileyAdd/src/smileys.cpp b/plugins/SmileyAdd/src/smileys.cpp index a9f69a1c5c..0d6492a59b 100644 --- a/plugins/SmileyAdd/src/smileys.cpp +++ b/plugins/SmileyAdd/src/smileys.cpp @@ -704,10 +704,13 @@ void SmileyCategoryListType::ClearAndLoadAll(void) it->Load();
}
-SmileyCategoryType* SmileyCategoryListType::GetSmileyCategory(const CMStringW &name)
+SmileyCategoryType* SmileyCategoryListType::GetSmileyCategory(const wchar_t *pwszName)
{
+ if (!pwszName)
+ return nullptr;
+
for (auto &it : m_SmileyCategories)
- if (name.CompareNoCase(it->GetName()) == 0)
+ if (it->GetName().CompareNoCase(pwszName) == 0)
return it;
return nullptr;
@@ -780,8 +783,10 @@ void SmileyCategoryListType::AddAccountAsCategory(PROTOACCOUNT *acc, const CMStr db_free(&dbv);
}
- if (!PhysProtoName.IsEmpty())
- paths = g_SmileyCategories.GetSmileyCategory(PhysProtoName) ? g_SmileyCategories.GetSmileyCategory(PhysProtoName)->GetFilename() : L"";
+ if (!PhysProtoName.IsEmpty()) {
+ auto *p = g_SmileyCategories.GetSmileyCategory(PhysProtoName);
+ paths = (p) ? p->GetFilename() : L"";
+ }
// assemble default path
if (paths.IsEmpty()) {
|