Index: src/plugin/PluginTabBase.cpp |
=================================================================== |
--- a/src/plugin/PluginTabBase.cpp |
+++ b/src/plugin/PluginTabBase.cpp |
@@ -27,11 +27,6 @@ |
#include <dispex.h> |
#include <Mshtmhst.h> |
-int CPluginTabBase::s_dictionaryVersion = 0; |
-int CPluginTabBase::s_settingsVersion = 1; |
-int CPluginTabBase::s_filterVersion = 0; |
-int CPluginTabBase::s_whitelistVersion = 0; |
- |
CPluginTabBase::CPluginTabBase(CPluginClass* plugin) |
: m_plugin(plugin) |
, m_isActivated(false) |
@@ -312,6 +307,10 @@ |
m_criticalSectionCache.Unlock(); |
} |
+/* |
+ * TODO: Replace the management of the log queue in this thread within CPluginTabBase |
+ * with a version of the log queue that uses a single internal worker thread. |
+ */ |
Eric
2015/02/18 19:20:25
I put this comment into the change set because the
Oleksandr
2015/02/27 10:59:27
I'd vote for an issue instead of a TODO. Though I
Eric
2015/02/27 16:47:47
https://issues.adblockplus.org/ticket/2058
|
void CPluginTabBase::ThreadProc() |
{ |
// Force loading/creation of settings |
@@ -347,17 +346,7 @@ |
DEBUG_THREAD("Loop iteration " + sTabLoopIteration); |
DEBUG_THREAD("--------------------------------------------------------------------------------") |
#endif |
- if (this->m_isActivated) |
- { |
- bool isChanged = false; |
- |
- if (isChanged) |
- { |
- this->m_plugin->UpdateStatusBar(); |
- } |
- |
- this->m_isActivated = false; |
- } |
Eric
2015/02/18 19:20:25
I don't know where this code came from originally,
Oleksandr
2015/02/27 10:59:27
Let's just say there was a lot of optimization hap
Eric
2015/02/27 16:47:47
I promise I won't bookmark this URL and pull it ou
|
+ this->m_isActivated = false; |
// -------------------------------------------------------------------- |
// End loop |
@@ -368,9 +357,9 @@ |
{ |
// Post async plugin error |
CPluginError pluginError; |
- if (CPluginClient::PopFirstPluginError(pluginError)) |
+ if (LogQueue::PopFirstPluginError(pluginError)) |
{ |
- CPluginClient::LogPluginError(pluginError.GetErrorCode(), pluginError.GetErrorId(), pluginError.GetErrorSubid(), pluginError.GetErrorDescription(), true, pluginError.GetProcessId(), pluginError.GetThreadId()); |
+ LogQueue::LogPluginError(pluginError.GetErrorCode(), pluginError.GetErrorId(), pluginError.GetErrorSubid(), pluginError.GetErrorDescription(), true, pluginError.GetProcessId(), pluginError.GetThreadId()); |
} |
// Non-hanging sleep |