pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Logging exception in Framework::GetSearchEngine().

Browse source
This commit is contained in:
vng 2012-07-09 17:39:30 -07:00 • committed by Alex Zolotarev
parent b4fa0162b4
commit 13416e114c
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
map/framework.cpp
View file

@ -927,22 +927,24 @@ void Framework::StopScale(ScaleEvent const & e)
search::Engine * Framework::GetSearchEngine() const
{
// Classical "double check" synchronization pattern.
if (!m_pSearchEngine)
{
//threads::MutexGuard lock(m_modelSyn);
if (!m_pSearchEngine)
{
Platform & pl = GetPlatform();
Platform & pl = GetPlatform();
m_pSearchEngine.reset(
new search::Engine(&m_model.GetIndex(),
try
{
m_pSearchEngine.reset(new search::Engine(&m_model.GetIndex(),
pl.GetReader(SEARCH_CATEGORIES_FILE_NAME),
pl.GetReader(PACKED_POLYGONS_FILE),
pl.GetReader(COUNTRIES_FILE),
languages::CurrentLanguage()));
}
catch (RootException const & e)
{
LOG(LCRITICAL, ("Can't load needed resources for search::Engine: ", e.Msg()));
}
}
return m_pSearchEngine.get();
}