Merge "Fixed crash when selecting navigation item from map activity w…

…hen map was accessed from sessions details"
google · May 6, 2016 · 894784e · 894784e
2 parents 57a9f48 + 7000060
commit 894784e
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/...c/main/java/com/google/samples/apps/iosched/navigation/AppNavigationViewAsDrawerImpl.java b/...c/main/java/com/google/samples/apps/iosched/navigation/AppNavigationViewAsDrawerImpl.java
@@ -386,7 +386,11 @@ public void run() {
             }
         }
 
-        mDrawerLayout.closeDrawer(GravityCompat.START);
+        // The navigation menu is accessible from some screens, via swiping, without a drawer
+        // layout, eg MapActivity when accessed from SessionDetailsActivity.
+        if (mDrawerLayout != null) {
+            mDrawerLayout.closeDrawer(GravityCompat.START);
+        }
     }
 
     private boolean isSpecialItem(NavigationItemEnum item) {