From 71a8b4329ee9615903ce87eabf8fe5e1fff373d5 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 19 Apr 2015 14:30:18 +0000 Subject: fix not to activate Nudge menu item if a proto doesn't support it git-svn-id: http://svn.miranda-ng.org/main/trunk@12934 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Nudge/src/Version.h | 2 +- plugins/Nudge/src/main.cpp | 17 ++++++----------- 2 files changed, 7 insertions(+), 12 deletions(-) (limited to 'plugins') diff --git a/plugins/Nudge/src/Version.h b/plugins/Nudge/src/Version.h index e3e9d259c6..626d2ccc79 100644 --- a/plugins/Nudge/src/Version.h +++ b/plugins/Nudge/src/Version.h @@ -1,7 +1,7 @@ #define __MAJOR_VERSION 0 #define __MINOR_VERSION 2 #define __RELEASE_NUM 0 -#define __BUILD_NUM 1 +#define __BUILD_NUM 2 #include diff --git a/plugins/Nudge/src/main.cpp b/plugins/Nudge/src/main.cpp index a9fa60ccf9..a29faf36c1 100644 --- a/plugins/Nudge/src/main.cpp +++ b/plugins/Nudge/src/main.cpp @@ -31,19 +31,14 @@ PLUGININFOEX pluginInfo = { INT_PTR NudgeShowMenu(WPARAM wParam, LPARAM lParam) { - bool bEnabled; - if (GlobalNudge.useByProtocol) { - bEnabled = false; - for (int i = 0; i < arNudges.getCount(); i++) { - CNudgeElement &p = arNudges[i]; - if (!strcmp((char*)wParam, p.ProtocolName)) { - bEnabled = p.enabled; - break; - } + bool bEnabled = false; + for (int i = 0; i < arNudges.getCount(); i++) { + CNudgeElement &p = arNudges[i]; + if (!strcmp((char*)wParam, p.ProtocolName)) { + bEnabled = (GlobalNudge.useByProtocol) ? p.enabled : DefaultNudge.enabled; + break; } } - else - bEnabled = DefaultNudge.enabled; Menu_ShowItem(g_hContactMenu, bEnabled && lParam != 0); return 0; -- cgit v1.2.3