From 88790eed4ffd9ca555c8f9b73cb014a93b57a34f Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 22 Jun 2015 20:38:56 +0000
Subject: Menu_ModifyItem unbound from CLISTMENUITEM structure

git-svn-id: http://svn.miranda-ng.org/main/trunk@14334 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Clist_modern/src/modern_clistmenus.cpp | 35 +++++++++++++-------------
 1 file changed, 17 insertions(+), 18 deletions(-)

(limited to 'plugins/Clist_modern/src/modern_clistmenus.cpp')

diff --git a/plugins/Clist_modern/src/modern_clistmenus.cpp b/plugins/Clist_modern/src/modern_clistmenus.cpp
index f9d532d532..809bb75508 100644
--- a/plugins/Clist_modern/src/modern_clistmenus.cpp
+++ b/plugins/Clist_modern/src/modern_clistmenus.cpp
@@ -117,8 +117,7 @@ static int FAV_OnContactMenuBuild(WPARAM hContact, LPARAM)
 	if (!hFavoriteContactMenu)
 		hFavoriteContactMenu = Menu_AddContactMenuItem(&mi);
 	else {
-		mi.flags |= CMIM_FLAGS | CMIM_NAME;
-		Menu_ModifyItem(hFavoriteContactMenu, &mi);
+		Menu_ModifyItem(hFavoriteContactMenu, mi.ptszName);
 		bModifyMenu = TRUE;
 	}
 
@@ -136,29 +135,29 @@ static int FAV_OnContactMenuBuild(WPARAM hContact, LPARAM)
 
 	int i;
 	for (i = 0; i < _countof(rates); i++) {
-		mi.icolibItem = iconList[i].hIcolib;
-		mi.ptszName = rates[i];
 		mi.flags = CMIF_CHILDPOPUP | CMIF_TCHAR | ((bContactRate == i) ? CMIF_CHECKED : 0);
-		mi.pszService = CLUI_FAVSETRATE;
-		mi.popupPosition = i;
-		if (bModifyMenu && hFavoriteContactMenuItems[i]) {
-			mi.flags |= CMIM_FLAGS | CMIM_ICON;
-			Menu_ModifyItem(hFavoriteContactMenuItems[i], &mi);
+		if (bModifyMenu && hFavoriteContactMenuItems[i])
+			Menu_ModifyItem(hFavoriteContactMenuItems[i], NULL, iconList[i].hIcolib, mi.flags);
+		else {
+			mi.icolibItem = iconList[i].hIcolib;
+			mi.ptszName = rates[i];
+			mi.pszService = CLUI_FAVSETRATE;
+			mi.popupPosition = i;
+			hFavoriteContactMenuItems[i] = Menu_AddContactMenuItem(&mi);
 		}
-		else hFavoriteContactMenuItems[i] = Menu_AddContactMenuItem(&mi);
 	}
 
 	mi.hIcon = NULL;
-	mi.ptszName = LPGENT("Show even if offline");
 	mi.flags = CMIF_CHILDPOPUP | CMIF_TCHAR | (db_get_b(hContact, "CList", "noOffline", 0) ? CMIF_CHECKED : 0);
-	mi.pszService = CLUI_FAVTOGGLESHOWOFFLINE;
-	mi.popupPosition = i + 100000000;
-	mi.position = -100000000;
-	if (bModifyMenu && hShowIfOflineItem) {
-		mi.flags |= CMIM_FLAGS | CMIM_ICON;
-		Menu_ModifyItem(hShowIfOflineItem, &mi);
+	if (bModifyMenu && hShowIfOflineItem)
+		Menu_ModifyItem(hShowIfOflineItem, NULL, INVALID_HANDLE_VALUE, mi.flags);
+	else {
+		mi.pszService = CLUI_FAVTOGGLESHOWOFFLINE;
+		mi.popupPosition = i + 100000000;
+		mi.position = -100000000;
+		mi.ptszName = LPGENT("Show even if offline");
+		hShowIfOflineItem = Menu_AddContactMenuItem(&mi);
 	}
-	else hShowIfOflineItem = Menu_AddContactMenuItem(&mi);
 
 	return 0;
 }
-- 
cgit v1.2.3