#335 fixing some NPEs

osmdroid · Jul 4, 2016 · d436504 · d436504
1 parent 658ce31
commit d436504
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/OpenStreetMapViewer/src/main/java/org/osmdroid/samplefragments/SampleGridlines.java b/OpenStreetMapViewer/src/main/java/org/osmdroid/samplefragments/SampleGridlines.java
@@ -58,10 +58,10 @@ private void updateGridlines(){
 
     @Override
     public void onDestroyView(){
-        super.onDestroyView();
+
         activeLatLonGrid.onDetach(mMapView);
         activeLatLonGrid=null;
-
+        super.onDestroyView();
     }
 
 }
diff --git a/osmdroid-android/src/main/java/org/osmdroid/views/overlay/FolderOverlay.java b/osmdroid-android/src/main/java/org/osmdroid/views/overlay/FolderOverlay.java
@@ -111,7 +111,8 @@ public void closeAllInfoWindows(){
 
 	@Override
 	public void onDetach(MapView mapView){
-		mOverlayManager.onDetach(mapView);
+		if (mOverlayManager!=null)
+			mOverlayManager.onDetach(mapView);
 		mOverlayManager=null;
 	}