From d0a1040e019092c29d8d2a2c2a29bc1e7644a5e5 Mon Sep 17 00:00:00 2001 From: MikalaiR Date: Wed, 16 Sep 2015 12:35:57 +0000 Subject: Toaster: more optimizations git-svn-id: http://svn.miranda-ng.org/main/trunk@15361 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Toaster/src/toast_notification.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'plugins/Toaster/src/toast_notification.cpp') diff --git a/plugins/Toaster/src/toast_notification.cpp b/plugins/Toaster/src/toast_notification.cpp index 4eb83adca4..02b190a80e 100644 --- a/plugins/Toaster/src/toast_notification.cpp +++ b/plugins/Toaster/src/toast_notification.cpp @@ -9,6 +9,9 @@ ToastNotification::ToastNotification(_In_ wchar_t* text, _In_ wchar_t* caption, ToastNotification::~ToastNotification() { + notification->remove_Activated(ertActivated); + notification->remove_Dismissed(ertDismissed); + notification->remove_Failed(ertFailed); } HRESULT ToastNotification::Initialize() @@ -79,12 +82,12 @@ HRESULT ToastNotification::Show() HRESULT ToastNotification::Show(_In_ ToastEventHandler* handler) { - EventRegistrationToken activatedToken, dismissedToken, failedToken; + ComPtr eventHandler(handler); - notification->add_Activated(eventHandler.Get(), &activatedToken); - notification->add_Dismissed(eventHandler.Get(), &dismissedToken); - notification->add_Failed(eventHandler.Get(), &failedToken); + notification->add_Activated(eventHandler.Get(), &ertActivated); + notification->add_Dismissed(eventHandler.Get(), &ertDismissed); + notification->add_Failed(eventHandler.Get(), &ertFailed); return notifier->Show(notification.Get()); } -- cgit v1.2.3