| Index: src/plugin/PluginTabBase.cpp |
| =================================================================== |
| --- a/src/plugin/PluginTabBase.cpp |
| +++ b/src/plugin/PluginTabBase.cpp |
| @@ -84,10 +84,19 @@ |
| namespace |
| { |
| + // Entry Point |
| void FilterLoader(CPluginTabBase* tabBase) |
| { |
| - tabBase->m_filter->LoadHideFilters(CPluginClient::GetInstance()->GetElementHidingSelectors(tabBase->GetDocumentDomain())); |
| - SetEvent(tabBase->m_filter->hideFiltersLoadedEvent); |
| + try |
| + { |
| + tabBase->m_filter->LoadHideFilters(CPluginClient::GetInstance()->GetElementHidingSelectors(tabBase->GetDocumentDomain())); |
| + SetEvent(tabBase->m_filter->hideFiltersLoadedEvent); |
| + } |
| + catch (...) |
| + { |
| + // There's presently a race condition between loading filters and terminating the appplication; see #1654. |
| + // In this particular case, it's OK to simply suppress the exception. |
|
sergei
2015/02/13 14:41:40
This comment is not relevant as well.
Eric
2015/02/13 15:13:52
This wording is indeed not right. I've changed it
|
| + } |
| } |
| } |