Merge pull request #1877 from campbeb/fix1848

Fix #1848 - Allow Store for Offline from map for list of caches

1 files changed, 3 insertions, 5 deletions

diff --git a/main/src/cgeo/geocaching/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java
index cf90430..c4c2dc7 100644
--- a/main/src/cgeo/geocaching/maps/CGeoMap.java
+++ b/main/src/cgeo/geocaching/maps/CGeoMap.java
@@ -193,7 +193,6 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto
     /**Controls the map behaviour*/
     private MapMode mapMode = null;
     // other things
-    //    private boolean live = true; // live map (live, dead) or rest (displaying caches on map)
     private boolean liveChanged = false; // previous state for loadTimer
     private boolean centered = false; // if map is already centered
     private boolean alreadyCentered = false; // -""- for setting my location
@@ -608,7 +607,7 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto
             }
 
             final Set<String> geocodesInViewport = getGeocodesForCachesInViewport();
-            menu.findItem(MENU_STORE_CACHES).setEnabled(isLiveMode() && !isLoading() && CollectionUtils.isNotEmpty(geocodesInViewport) && app.hasUnsavedCaches(new SearchResult(geocodesInViewport)));
+            menu.findItem(MENU_STORE_CACHES).setEnabled(!isLoading() && CollectionUtils.isNotEmpty(geocodesInViewport) && app.hasUnsavedCaches(new SearchResult(geocodesInViewport)));
 
             item = menu.findItem(MENU_CIRCLE_MODE); // show circles
             if (overlayCaches != null && overlayCaches.getCircles()) {
@@ -617,12 +616,11 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto
                 item.setTitle(res.getString(R.string.map_circles_show));
             }
 
-            item = menu.findItem(MENU_AS_LIST);
-            item.setEnabled(isLiveMode() && !isLoading());
+            menu.findItem(MENU_AS_LIST).setEnabled(isLiveMode() && !isLoading());
 
             menu.findItem(SUBMENU_STRATEGY).setEnabled(isLiveMode());
         } catch (Exception e) {
-            Log.e("cgeomap.onPrepareOptionsMenu: " + e.toString());
+            Log.e("cgeomap.onPrepareOptionsMenu: " + e);
         }
 
         return true;