From 09af1fc3d99c95a3f9a6f4401395c00082927243 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 17 Sep 2013 21:43:29 +0000
Subject: no need to send WM_DESTROY to a window being unsubclassed

git-svn-id: http://svn.miranda-ng.org/main/trunk@6117 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/modules/clist/clisttray.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/modules/clist')

diff --git a/src/modules/clist/clisttray.cpp b/src/modules/clist/clisttray.cpp
index 4bd8d68c34..97a0d9d08d 100644
--- a/src/modules/clist/clisttray.cpp
+++ b/src/modules/clist/clisttray.cpp
@@ -738,13 +738,11 @@ INT_PTR fnTrayIconProcessMessage(WPARAM wParam, LPARAM lParam)
 				cli.pfnShowHide(0, 0);
 		}
 		else if (msg->lParam == WM_RBUTTONUP) {
-			MENUITEMINFO mi;
-			POINT pt;
 			HMENU hMainMenu = LoadMenu(cli.hInst, MAKEINTRESOURCE(IDR_CONTEXT));
 			HMENU hMenu = GetSubMenu(hMainMenu, 0);
 			TranslateMenu(hMenu);
 
-			ZeroMemory(&mi, sizeof(mi));
+			MENUITEMINFO mi = { 0 };
 			mi.cbSize = MENUITEMINFO_V4_SIZE;
 			mi.fMask = MIIM_SUBMENU | MIIM_TYPE;
 			mi.fType = MFT_STRING;
@@ -758,6 +756,8 @@ INT_PTR fnTrayIconProcessMessage(WPARAM wParam, LPARAM lParam)
 
 			SetForegroundWindow(msg->hwnd);
 			SetFocus(msg->hwnd);
+
+			POINT pt;
 			GetCursorPos(&pt);
 			TrackPopupMenu(hMenu, TPM_TOPALIGN | TPM_LEFTALIGN, pt.x, pt.y, 0, msg->hwnd, NULL);
 
-- 
cgit v1.2.3