Disable everywhere fix

src/plugin/PluginSettings.cpp

 #include "PluginStdAfx.h"
 
 #include <Wbemidl.h>
 #include <time.h>
 #include "PluginSettings.h"
 #include "PluginClient.h"
 #include "PluginSystem.h"
 #ifdef SUPPORT_FILTER
 #include "PluginFilter.h"
 #endif
@@ skipping 48 matching lines @@
   ~CPluginSettingsWhitelistLock() {}
 };
 
 #endif
 
 CPluginSettings* CPluginSettings::s_instance = NULL;
 
 CComAutoCriticalSection CPluginSettings::s_criticalSectionLocal;
 
 
-CPluginSettings::CPluginSettings() : m_dwWorkingThreadId(0), m_isPluginEnabledTab(true)
+CPluginSettings::CPluginSettings() : m_dwWorkingThreadId(0)
 {
   s_instance = NULL;
 
   m_WindowsBuildNumber = 0;
 
 #ifdef SUPPORT_WHITELIST
   ClearWhitelist();
 #endif
 }
 
@@ skipping 62 matching lines @@
   lang.Append(L"-");
   lang.Append(country);
 
   return lang;
 
 }
 
 
 bool CPluginSettings::IsPluginEnabled() const
 {
-  return m_isPluginEnabledTab;
+  return GetPluginEnabled();
 }
 
 
 std::map<CString, CString> CPluginSettings::GetFilterLanguageTitleList()
 {
   m_subscriptions = CPluginClient::GetInstance()->FetchAvailableSubscriptions();
 
   std::map<CString, CString> filterList;
   for (size_t i = 0; i < m_subscriptions.size(); i ++)
   {
@@ skipping 17 matching lines @@
   m_dwWorkingThreadId = ::GetCurrentThreadId();
 }
 
 void CPluginSettings::SetWorkingThreadId(DWORD id)
 {
   m_dwWorkingThreadId = id;
 }
 
 void CPluginSettings::TogglePluginEnabled()
 {
-  CPluginSettingsTabLock lock;
-  if (lock.IsLocked())
-  {
-    s_criticalSectionLocal.Lock();
-    {
-      //TODO: Query if plugin is enabled from the AdblockPlusEngine
-      m_isPluginEnabledTab = m_isPluginEnabledTab ? false : true;
-      //TODO: Set plugin enabled/disabled in AdblockPlusEngine
-    }
-    s_criticalSectionLocal.Unlock();
-  }
+  GetPluginEnabled() ? SetPluginDisabled() : SetPluginEnabled();   

[Wladimir Palant, 2013/08/13 14:25:29]

The SetPluginEnabled/SetPluginDisabled functions are only used here. This means
that we could just as well do the following and save some code:

  CPluginClient::GetInstance()->SetPref(L"enabled", !GetPluginEnabled());

Still, this requires two calls to the engine where one would be sufficient
(never mind the race condition) - I would prefer to do a single "toggle" call
and let the engine check the current state of the pref.

Both issues can be fixed after the release I guess...

 }
 void CPluginSettings::SetPluginDisabled()
 {
-  CPluginSettingsTabLock lock;
-  if (lock.IsLocked())
-  {
-    s_criticalSectionLocal.Lock();
-    {
-      m_isPluginEnabledTab = false;
-      //TODO: Set plugin disabled in AdblockPlusEngine
-    }
-    s_criticalSectionLocal.Unlock();
-  }
+  CPluginClient::GetInstance()->SetPref(L"enabled", false);  
 }
 void CPluginSettings::SetPluginEnabled()
 {
   CPluginClient::GetInstance()->SetPref(L"enabled", true);
 }
 bool CPluginSettings::GetPluginEnabled() const
 {
   return CPluginClient::GetInstance()->GetPref(L"enabled", true);
 }
 
@@ skipping 134 matching lines @@
 }
 
 CString CPluginSettings::GetDocumentationLink()
 {
   return CString(CPluginClient::GetInstance()->GetDocumentationLink().c_str());
 }
 
 
 
 #endif // SUPPORT_WHITELIST