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

[omim] Fixed crash on migration.

Browse source
This commit is contained in:
Ilya Grechuhin 2016-02-24 12:12:30 +03:00 • committed by Sergey Yershov
parent b882d628e7
commit fb5eae10cc
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
map/framework.cpp
View file

@ -261,6 +261,11 @@ bool Framework::PreMigrate(ms::LatLon const & position,
void Framework::Migrate(bool keepDownloaded)
{
// Drape must be suspended while migration is performed since it access different parts of
// framework (i.e. m_infoGetter) which are reinitialized during migration process.
// If we do not suspend drape, it tries to access framework fields (i.e. m_infoGetter) which are null
// while migration is performed.
SetRenderingEnabled(false);
m_searchEngine.reset();
m_infoGetter.reset();
TCountriesVec existedCountries;
@ -271,6 +276,7 @@ void Framework::Migrate(bool keepDownloaded)
InitCountryInfoGetter();
InitSearchEngine();
RegisterAllMaps();
SetRenderingEnabled(true);
InvalidateRect(MercatorBounds::FullRect());
}