From a8c93cfbf235c31cf604cb6bd40009e9bf88f36a Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 30 Jun 2015 20:27:23 +0000
Subject: - fix for the old perversion with manual protocol root calculation; -
protocol menu root is always created by the core; - other minor problems with
protocol menus in main menu went away
git-svn-id: http://svn.miranda-ng.org/main/trunk@14462 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
plugins/CSList/src/cslist.cpp | 4 ++--
plugins/SecureIM/src/main.cpp | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
(limited to 'plugins')
diff --git a/plugins/CSList/src/cslist.cpp b/plugins/CSList/src/cslist.cpp
index 2c5adcd426..442d2ae86d 100644
--- a/plugins/CSList/src/cslist.cpp
+++ b/plugins/CSList/src/cslist.cpp
@@ -226,10 +226,10 @@ INT_PTR showList(WPARAM, LPARAM, LPARAM param)
void addProtoStatusMenuItem(char *protoName)
{
PROTOACCOUNT *pdescr = Proto_GetAccount(protoName);
- if (pdescr == NULL)
+ if (pdescr == NULL || pdescr->ppro == NULL)
return;
- HGENMENU hRoot = Menu_GetProtocolRoot(pdescr->szModuleName);
+ HGENMENU hRoot = Menu_GetProtocolRoot(pdescr->ppro);
if (hRoot == NULL)
return;
diff --git a/plugins/SecureIM/src/main.cpp b/plugins/SecureIM/src/main.cpp
index 97ce846321..b95da08213 100644
--- a/plugins/SecureIM/src/main.cpp
+++ b/plugins/SecureIM/src/main.cpp
@@ -51,7 +51,7 @@ static HGENMENU MyAddMenuItem(LPCWSTR name, int pos, HICON hicon, LPCSTR service
static HGENMENU MyAddSubItem(HGENMENU hRoot, LPCSTR name, int pos, int poppos, LPCSTR service, WPARAM wParam = 0)
{
CMenuItem mi;
- mi.flags = CMIF_HIDDEN;
+ mi.flags = CMIF_HIDDEN;
mi.position = pos;
mi.name.a = (char*)name;
mi.root = hRoot;
--
cgit v1.2.3