diff options
| author | George Hazan <ghazan@miranda.im> | 2022-01-11 19:38:36 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2022-01-11 19:38:36 +0300 |
| commit | f8cfe24d1b96765f628e086da2023755b2577675 (patch) | |
| tree | 0146fc9c666ac5631c4b01e2bb1f3f52e6f61d53 | |
| parent | a6c917a4f0126f523284f5d81e939ff5b3f5a478 (diff) | |
redundant check removed
| -rw-r--r-- | src/mir_app/src/ei_services.cpp | 6 | ||||
| -rw-r--r-- | src/mir_app/src/usedIcons.cpp | 17 |
2 files changed, 7 insertions, 16 deletions
diff --git a/src/mir_app/src/ei_services.cpp b/src/mir_app/src/ei_services.cpp index e781c06a22..56e3d22b15 100644 --- a/src/mir_app/src/ei_services.cpp +++ b/src/mir_app/src/ei_services.cpp @@ -69,11 +69,7 @@ int Clist_SetExtraIcon(MCONTACT hContact, int slot, HANDLE hImage) if (icol == -1) return -1; - HANDLE hItem = (HANDLE)SendMessage(g_clistApi.hwndContactTree, CLM_FINDCONTACT, hContact, 0); - if (hItem == nullptr) - return -1; - - SendMessage(g_clistApi.hwndContactTree, CLM_SETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(icol, hImage)); + SendMessage(g_clistApi.hwndContactTree, CLM_SETEXTRAIMAGE, hContact, MAKELPARAM(icol, hImage)); return 0; } diff --git a/src/mir_app/src/usedIcons.cpp b/src/mir_app/src/usedIcons.cpp index 2e12d1bc08..dec0672025 100644 --- a/src/mir_app/src/usedIcons.cpp +++ b/src/mir_app/src/usedIcons.cpp @@ -25,18 +25,13 @@ Boston, MA 02111-1307, USA. struct Icon
{
- char *name;
- int refCount;
- HANDLE hImage;
+ ptrA name;
+ int refCount = 0;
+ HANDLE hImage = INVALID_HANDLE_VALUE;
Icon(const char *icolibName) :
- name( mir_strdup(icolibName)), refCount(0), hImage(INVALID_HANDLE_VALUE)
- {
- }
-
- ~Icon()
- { mir_free(name);
- }
+ name(mir_strdup(icolibName))
+ {}
};
static int SortFunc(const Icon *p1, const Icon *p2)
@@ -77,7 +72,7 @@ HANDLE AddIcon(const char *icolibName) void RemoveIcon(const char *icolibName)
{
- Icon *icon = usedIcons.find((Icon*)&icolibName);
+ Icon *icon = usedIcons.find((Icon *)&icolibName);
if (icon != nullptr)
icon->refCount--;
}
|