From a8c76fb1f7113f18fda981ae885066d04619571f Mon Sep 17 00:00:00 2001 From: MikalaiR Date: Mon, 14 Sep 2015 18:43:41 +0000 Subject: Toaster: small fixes git-svn-id: http://svn.miranda-ng.org/main/trunk@15351 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Toaster/src/services.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'plugins/Toaster/src/services.cpp') 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); } -- cgit v1.2.3