Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: src/plugin/PluginTabBase.cpp

Issue 5351131051982848: Issues #1173 - Add exception handler to entry point FilterLoader (Closed)
Patch Set: Created Feb. 12, 2015, 7:26 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
+ }
}
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld