Fixes #3698, Archived caches still shown on map

- filter archived as disabled on map
- their waypoints as well
- use disabled icon for archived on static maps
- filter archived alongside disabled in SearchResult

1 files changed, 1 insertions, 0 deletions

diff --git a/main/src/cgeo/geocaching/DataStore.java b/main/src/cgeo/geocaching/DataStore.java
index 32a4b64..c66b653 100644
--- a/main/src/cgeo/geocaching/DataStore.java
+++ b/main/src/cgeo/geocaching/DataStore.java
@@ -2895,6 +2895,7 @@ public class DataStore {
         }
         if (excludeDisabled) {
             where.append(" and ").append(dbTableCaches).append(".disabled == 0");
+            where.append(" and ").append(dbTableCaches).append(".archived == 0");
         }
         if (type != CacheType.ALL) {
             where.append(" and ").append(dbTableCaches).append(".type == '").append(type.id).append('\'');