Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2018-04-26 09:56:51 +02:00
commit 609fbdfe1a

View file

@ -242,7 +242,11 @@ public class WikivoyageWebViewClient extends WebViewClient implements RegionCall
break; break;
} }
if(osmandRegions.contain(b, x31, y31)) { if(osmandRegions.contain(b, x31, y31)) {
return osmandRegions.getLocaleName(osmandRegions.getDownloadName(b), false); String downloadName = osmandRegions.getDownloadName(b);
if (downloadName == null) {
return "";
}
return osmandRegions.getLocaleName(downloadName, false);
} }
} }
} }