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

Merge pull request #1394 from VladiMihaylenko/vm-master

Browse source 
[omim] Fixed map style change's crash.
This commit is contained in:
Roman Kuznetsov 2016-01-14 14:53:41 +03:00
commit 3e52146577
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drape_frontend/frontend_renderer.cpp
View file

@ -16,6 +16,7 @@
#include "drape/utils/gpu_mem_tracker.hpp"
#include "drape/utils/projection.hpp"
#include "indexer/classificator_loader.hpp"
#include "indexer/scales.hpp"
#include "indexer/drawing_rules.hpp"
@ -427,6 +428,8 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
blocker.Wait();
}
classificator::Load();
// Invalidate textures and wait for completion.
{
BaseBlockingMessage::Blocker blocker;

2
map/framework.cpp
View file

@ -1398,8 +1398,6 @@ void Framework::SetMapStyle(MapStyle mapStyle)
Settings::Set(kMapStyleKey, static_cast<int>(mapStyle));
GetStyleReader().SetCurrentStyle(mapStyle);
classificator::Load();
drule::LoadRules();
CallDrapeFunction(bind(&df::DrapeEngine::UpdateMapStyle, _1));
InvalidateUserMarks();