Merge pull request #229 from apsherid/patch-1

Prevent crash on null Map Projection
googlemaps · Feb 15, 2016 · a4562a2 · a4562a2
2 parents 98514f4 + 269a101
commit a4562a2
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/library/src/com/google/maps/android/clustering/view/DefaultClusterRenderer.java b/library/src/com/google/maps/android/clustering/view/DefaultClusterRenderer.java
@@ -264,6 +264,11 @@ public void handleMessage(Message msg) {
                 // Nothing to do.
                 return;
             }
+            Projection projection = mMap.getProjection();
+            if (projection == null) {
+                // Without a map projection we can't render clusters.
+                return;
+            }
 
             RenderTask renderTask;
             synchronized (this) {
@@ -278,7 +283,7 @@ public void run() {
                     sendEmptyMessage(TASK_FINISHED);
                 }
             });
-            renderTask.setProjection(mMap.getProjection());
+            renderTask.setProjection(projection);
             renderTask.setMapZoom(mMap.getCameraPosition().zoom);
             new Thread(renderTask).start();
         }