Merge pull request #2491 from Portree-Kid/master-master

Live Mode not used correctly Fixes #2479 

1 files changed, 10 insertions, 5 deletions

diff --git a/main/src/cgeo/geocaching/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java
index b2216c7..7a59e5b 100644
--- a/main/src/cgeo/geocaching/maps/CGeoMap.java
+++ b/main/src/cgeo/geocaching/maps/CGeoMap.java
@@ -1105,10 +1105,9 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto
                 caches.removeAll(cachesFromSearchResult);
                 caches.addAll(cachesFromSearchResult);
 
+                final boolean excludeMine = Settings.isExcludeMyCaches();
+                final boolean excludeDisabled = Settings.isExcludeDisabledCaches();
                 if (mapMode == MapMode.LIVE) {
-                    final boolean excludeMine = Settings.isExcludeMyCaches();
-                    final boolean excludeDisabled = Settings.isExcludeDisabledCaches();
-
                     final List<Geocache> tempList = caches.getAsList();
 
                     for (Geocache cache : tempList) {
@@ -1120,20 +1119,26 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto
                 countVisibleCaches();
                 if (cachesCnt < Settings.getWayPointsThreshold() || geocodeIntent != null) {
                     waypoints.clear();
-                    if (isLiveEnabled || mapMode == MapMode.COORDS) {
+                    if (isLiveEnabled || mapMode == MapMode.LIVE || mapMode == MapMode.COORDS) {
                         //All visible waypoints
                         CacheType type = Settings.getCacheType();
-                        Set<Waypoint> waypointsInViewport = cgData.loadWaypoints(viewport, Settings.isExcludeMyCaches(), Settings.isExcludeDisabledCaches(), type);
+                        Set<Waypoint> waypointsInViewport = cgData.loadWaypoints(viewport, excludeMine, excludeDisabled, type);
                         waypoints.addAll(waypointsInViewport);
                     }
                     else
                     {
+                        // we don't want to see any stale
+                        waypoints.clear();
                         //All waypoints from the viewed caches
                         for (Geocache c : caches.getAsList()) {
                             waypoints.addAll(c.getWaypoints());
                         }
                     }
                 }
+                else {
+                    // we don't want to see any stale waypoints when above threshold
+                    waypoints.clear();
+                }
 
                 //render
                 displayExecutor.execute(new DisplayRunnable(viewport));