kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Fixed crash on application exit

Browse source
This commit is contained in:
r.kuznetsov 2018-01-09 17:49:11 +03:00 • committed by Yuri Gorshenin
parent 6c899af9e1
commit a1cf23fd5a
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
map/framework.cpp
View file

@ -356,7 +356,10 @@ void Framework::Migrate(bool keepDownloaded)
}
Framework::Framework(FrameworkParams const & params)
: m_startForegroundTime(0.0)
: m_localAdsManager(bind(&Framework::GetMwmsByRect, this, _1, true /* rough */),
bind(&Framework::GetMwmIdByName, this, _1),
bind(&Framework::ReadFeatures, this, _1, _2))
, m_startForegroundTime(0.0)
, m_storage(platform::migrate::NeedMigrate() ? COUNTRIES_OBSOLETE_FILE : COUNTRIES_FILE)
, m_enabledDiffs(params.m_enableDiffs)
, m_isRenderingEnabled(true)
@ -374,9 +377,6 @@ Framework::Framework(FrameworkParams const & params)
static_cast<RoutingManager::Delegate &>(*this))
, m_trafficManager(bind(&Framework::GetMwmsByRect, this, _1, false /* rough */),
kMaxTrafficCacheSizeBytes, m_routingManager.RoutingSession())
, m_localAdsManager(bind(&Framework::GetMwmsByRect, this, _1, true /* rough */),
bind(&Framework::GetMwmIdByName, this, _1),
bind(&Framework::ReadFeatures, this, _1, _2))
, m_bookingFilter(m_model.GetIndex(), *m_bookingApi)
, m_displacementModeManager([this](bool show) {
int const mode = show ? dp::displacement::kHotelMode : dp::displacement::kDefaultMode;

4
map/framework.hpp
View file

@ -164,6 +164,8 @@ protected:
unique_ptr<ugc::Api> m_ugcApi;
LocalAdsManager m_localAdsManager;
unique_ptr<SearchAPI> m_searchAPI;
search::QuerySaver m_searchQuerySaver;
@ -202,8 +204,6 @@ protected:
TrafficManager m_trafficManager;
LocalAdsManager m_localAdsManager;
User m_user;
booking::filter::Filter m_bookingFilter;