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

Android: SetMapStyle causes crash if GL context doesn't exist (old render policy does not exist)

Browse source
This commit is contained in:
Constantin Shalnev 2015-06-19 11:48:18 +03:00 • committed by Alex Zolotarev
parent cfaca17907
commit df8efe4ed1
1 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
android/jni/com/mapswithme/maps/Framework.cpp
View file

@ -214,16 +214,26 @@ namespace android
if (m_work.GetMapStyle() == mapStyle)
return;
// drop old render policy
m_work.SetRenderPolicy(nullptr);
bool const hasRenderPolicy = (nullptr != m_work.GetRenderPolicy());
m_work.SetMapStyle(mapStyle);
if (hasRenderPolicy)
{
// Drop old render policy.
m_work.SetRenderPolicy(nullptr);
// construct new render policy
if (!InitRenderPolicyImpl(m_densityDpi, m_screenWidth, m_screenHeight))
return;
m_work.SetMapStyle(mapStyle);
m_work.SetUpdatesEnabled(true);
// Construct new render policy.
if (!InitRenderPolicyImpl(m_densityDpi, m_screenWidth, m_screenHeight))
return;
m_work.SetUpdatesEnabled(true);
}
else
{
// Just set the flag, a new render policy will be initialized with this flag.
m_work.SetMapStyle(mapStyle);
}
}
Storage & Framework::Storage()