From 7d5469dcfa153a34c18d3c4468058bba38ce1b0d Mon Sep 17 00:00:00 2001
From: misaochan <josephinelim86@gmail.com>
Date: Sat, 3 Jun 2017 12:40:27 +1000
Subject: [PATCH] Add null check for nearbyAsyncTask

---
 .../nrw/commons/nearby/NearbyActivity.java    | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
index 1763b1a47..f2d3b6726 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
@@ -175,16 +175,18 @@ public class NearbyActivity extends NavigationBaseActivity {
     }
 
     private void showMapView() {
-        if (!isMapViewActive) {
-            isMapViewActive = true;
-            if (nearbyAsyncTask.getStatus() == AsyncTask.Status.FINISHED) {
-                setMapFragment();
-            }
+        if (nearbyAsyncTask != null) {
+            if (!isMapViewActive) {
+                isMapViewActive = true;
+                if (nearbyAsyncTask.getStatus() == AsyncTask.Status.FINISHED) {
+                    setMapFragment();
+                }
 
-        } else {
-            isMapViewActive = false;
-            if (nearbyAsyncTask.getStatus() == AsyncTask.Status.FINISHED) {
-                setListFragment();
+            } else {
+                isMapViewActive = false;
+                if (nearbyAsyncTask.getStatus() == AsyncTask.Status.FINISHED) {
+                    setListFragment();
+                }
             }
         }
     }