aboutsummaryrefslogtreecommitdiffstats
path: root/main/src/cgeo/geocaching/maps
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2013-01-01 17:38:32 +0100
committerSamuel Tardieu <sam@rfc1149.net>2013-01-01 17:38:32 +0100
commiteaca5dc0993d22ff5390a2f90cbfd63447fe33b0 (patch)
treef45671f7a3b654d49c8a9b45f2db63cdf75d041a /main/src/cgeo/geocaching/maps
parent415f3ce9871f727cadebc45a06769c99f0b7dd3c (diff)
parentc80b861a1072bd955c7ec51eab6bca0af19da137 (diff)
downloadcgeo-eaca5dc0993d22ff5390a2f90cbfd63447fe33b0.zip
cgeo-eaca5dc0993d22ff5390a2f90cbfd63447fe33b0.tar.gz
cgeo-eaca5dc0993d22ff5390a2f90cbfd63447fe33b0.tar.bz2
Merge branch 'release' into upstream
Diffstat (limited to 'main/src/cgeo/geocaching/maps')
-rw-r--r--main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapProvider.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapProvider.java b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapProvider.java
index 294eb79..dc0dbf8 100644
--- a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapProvider.java
+++ b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapProvider.java
@@ -93,7 +93,7 @@ public final class MapsforgeMapProvider extends AbstractMapProvider {
}
private static boolean isMapfile024(String mapFileIn) {
- return org.mapsforge.android.mapsold.MapDatabase.isValidMapFile(mapFileIn);
+ return mapFileIn != null && org.mapsforge.android.mapsold.MapDatabase.isValidMapFile(mapFileIn);
}
@Override