diff options
| author | MikalaiR <nikolay.romanovich@narod.ru> | 2015-08-30 07:11:11 +0000 |
|---|---|---|
| committer | MikalaiR <nikolay.romanovich@narod.ru> | 2015-08-30 07:11:11 +0000 |
| commit | a46baf1a0315e63a3e08b2272622831194cf7b11 (patch) | |
| tree | ac11c05e1dffcb5bd77e8ea16097d6ae6f91c677 /plugins/Toaster/src/services.cpp | |
| parent | a3441bbbcdef9558827f3223511871a1695cee8f (diff) | |
Toaster: code cleanup
git-svn-id: http://svn.miranda-ng.org/main/trunk@15111 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Toaster/src/services.cpp')
| -rw-r--r-- | plugins/Toaster/src/services.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/plugins/Toaster/src/services.cpp b/plugins/Toaster/src/services.cpp index 03475b5f38..a2747758e8 100644 --- a/plugins/Toaster/src/services.cpp +++ b/plugins/Toaster/src/services.cpp @@ -26,7 +26,6 @@ static void __cdecl OnToastNotificationClicked(void* arg) CallServiceSync(MS_GC_EVENT, WINDOW_VISIBLE, (LPARAM)&gce);
}
}
- lstNotifications.remove(cb->notification);
}
static void ShowToastNotification(TCHAR* text, TCHAR* title, MCONTACT hContact)
@@ -45,15 +44,16 @@ static void ShowToastNotification(TCHAR* text, TCHAR* title, MCONTACT hContact) {
PROTO_AVATAR_INFORMATION pai = { 0 };
pai.hContact = hContact;
- CallProtoService(szProto, PS_GETAVATARINFO, (WPARAM)0, (LPARAM)&pai);
- imagePath = pai.filename[0] ? mir_tstrdup(pai.filename) : nullptr;
+ if (CallProtoService(szProto, PS_GETAVATARINFO, 0, (LPARAM)&pai) == GAIR_SUCCESS)
+ {
+ imagePath = mir_tstrdup(pai.filename);
+ }
}
}
- ToastNotification* notification = new ToastNotification (text, title, imagePath);
- arg->notification = notification;
- notification->Show(new ToastEventHandler(OnToastNotificationClicked, arg));
- lstNotifications.insert(notification);
+ arg->notification = new ToastNotification(text, title, imagePath);
+ arg->notification->Show(new ToastEventHandler(OnToastNotificationClicked, arg));
+ lstNotifications.insert(arg->notification);
}
static INT_PTR CreatePopup(WPARAM wParam, LPARAM)
|