diff options
| author | MikalaiR <nikolay.romanovich@narod.ru> | 2015-09-14 18:43:41 +0000 |
|---|---|---|
| committer | MikalaiR <nikolay.romanovich@narod.ru> | 2015-09-14 18:43:41 +0000 |
| commit | a8c76fb1f7113f18fda981ae885066d04619571f (patch) | |
| tree | 1f875c998940285a0ac7e9732b5c84127a4fe849 /plugins/Toaster/src | |
| parent | bec03fef8475f5b3d19b8b2f1bf9983d84e42752 (diff) | |
Toaster: small fixes
git-svn-id: http://svn.miranda-ng.org/main/trunk@15351 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Toaster/src')
| -rw-r--r-- | plugins/Toaster/src/services.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/plugins/Toaster/src/services.cpp b/plugins/Toaster/src/services.cpp index 82d9c9413d..91e2e4aaa3 100644 --- a/plugins/Toaster/src/services.cpp +++ b/plugins/Toaster/src/services.cpp @@ -19,7 +19,8 @@ void __stdcall ShowToastNotification(void* p) if (ProtoServiceExists(szProto, PS_GETAVATARINFO))
{
- PROTO_AVATAR_INFORMATION pai = { td->hContact };
+ PROTO_AVATAR_INFORMATION pai = { 0 };
+ pai.hContact = td->hContact;
if (CallProtoService(szProto, PS_GETAVATARINFO, 0, (LPARAM)&pai) == GAIR_SUCCESS)
{
imagePath = mir_tstrdup(pai.filename);
@@ -28,11 +29,11 @@ void __stdcall ShowToastNotification(void* p) if (imagePath == NULL)
{
- if (td->iType == 1 && td->hBitmap)
+ if (td->iType == 1 && td->hBitmap && !szProto)
{
imagePath = ToasterImage(td->hBitmap);
}
- else if (td->iType == 2 && td->hIcon)
+ else if (td->iType == 2 && td->hIcon && !szProto)
{
imagePath = ToasterImage(td->hIcon);
}
|