Index: src/plugin/PluginClass.cpp |
=================================================================== |
--- a/src/plugin/PluginClass.cpp |
+++ b/src/plugin/PluginClass.cpp |
@@ -42,7 +42,6 @@ |
CComAutoCriticalSection CPluginClass::s_criticalSectionWindow; |
CComQIPtr<IWebBrowser2> CPluginClass::s_asyncWebBrowser2; |
-std::map<UINT,CString> CPluginClass::s_menuDomains; |
/* |
* Without namespace declaration, the identifier "Rectangle" is ambiguous |
@@ -1382,13 +1381,6 @@ |
DEBUG_GENERAL("SetMenuBar"); |
std::wstring ctext; |
- |
- s_criticalSectionLocal.Lock(); |
- { |
- s_menuDomains.clear(); |
- } |
- s_criticalSectionLocal.Unlock(); |
- |
Dictionary* dictionary = Dictionary::GetInstance(); |
MENUITEMINFOW fmii; |
@@ -1631,17 +1623,17 @@ |
if (tab) |
{ |
CPluginClient* client = CPluginClient::GetInstance(); |
- if (!CPluginSettings::GetInstance()->IsPluginEnabled()) |
+ if (CPluginSettings::GetInstance()->IsPluginEnabled()) |
{ |
- } |
- else if (client->IsWhitelistedUrl(to_wstring(url))) |
- { |
- hIcon = GetIcon(ICON_PLUGIN_DISABLED); |
- } |
- else |
- { |
- CPluginSettings* settings = CPluginSettings::GetInstance(); |
- hIcon = GetIcon(ICON_PLUGIN_ENABLED); |
+ if (client->IsWhitelistedUrl(to_wstring(url))) |
+ { |
+ hIcon = GetIcon(ICON_PLUGIN_DISABLED); |
+ } |
+ else |
+ { |
+ CPluginSettings* settings = CPluginSettings::GetInstance(); |
+ hIcon = GetIcon(ICON_PLUGIN_ENABLED); |
+ } |
} |
} |
return hIcon; |