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

Merge pull request #1126 from yunikkk/fonts-crashfix-drape

Browse source 
[android] Fixed possible crash with uninitialized Drape engine.
This commit is contained in:
Alexander Marchuk 2015-12-24 11:09:30 +03:00
commit 08c3b6b391
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
android/src/com/mapswithme/maps/MapFragment.java
View file

@ -94,7 +94,7 @@ public class MapFragment extends BaseMwmFragment
UiUtils.dimen(R.dimen.margin_compass_left) + offsetX,
mHeight - UiUtils.dimen(R.dimen.margin_compass_bottom) + offsetY,
ANCHOR_CENTER);
if (forceRedraw)
if (forceRedraw && mEngineCreated)
nativeApplyWidgets();
}
@ -104,7 +104,7 @@ public class MapFragment extends BaseMwmFragment
mWidth - UiUtils.dimen(R.dimen.margin_ruler_right) + offsetX,
mHeight - UiUtils.dimen(R.dimen.margin_ruler_bottom) + offsetY,
ANCHOR_RIGHT_BOTTOM);
if (forceRedraw)
if (forceRedraw && mEngineCreated)
nativeApplyWidgets();
}
@ -149,11 +149,14 @@ public class MapFragment extends BaseMwmFragment
getActivity().getWindowManager().getDefaultDisplay().getMetrics(metrics);
final float exactDensityDpi = metrics.densityDpi;
mEngineCreated = nativeCreateEngine(surface, (int)exactDensityDpi);
if (mEngineCreated)
onRenderingInitialized();
else
mEngineCreated = nativeCreateEngine(surface, (int) exactDensityDpi);
if (!mEngineCreated)
{
reportUnsupported();
return;
}
onRenderingInitialized();
}
@Override