aboutsummaryrefslogtreecommitdiffstats
path: root/main/src/cgeo/geocaching/Geocache.java
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2013-05-25 10:30:25 +0200
committerSamuel Tardieu <sam@rfc1149.net>2013-05-25 10:30:25 +0200
commitf97abf9389c3dfa292bfcff89e9a99ed7aab5a1f (patch)
treea1fd246242252fd9ba3b5b15167b6d9ded60f656 /main/src/cgeo/geocaching/Geocache.java
parent335fd3204f120893e654b03d7baa214640397ff1 (diff)
parentce354f10a0c28e3c6a3cd1407d62bc23968677f9 (diff)
downloadcgeo-f97abf9389c3dfa292bfcff89e9a99ed7aab5a1f.zip
cgeo-f97abf9389c3dfa292bfcff89e9a99ed7aab5a1f.tar.gz
cgeo-f97abf9389c3dfa292bfcff89e9a99ed7aab5a1f.tar.bz2
Merge branch 'issue-2771' into upstream
Diffstat (limited to 'main/src/cgeo/geocaching/Geocache.java')
-rw-r--r--main/src/cgeo/geocaching/Geocache.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/main/src/cgeo/geocaching/Geocache.java b/main/src/cgeo/geocaching/Geocache.java
index 2c9ba32..c585726 100644
--- a/main/src/cgeo/geocaching/Geocache.java
+++ b/main/src/cgeo/geocaching/Geocache.java
@@ -194,15 +194,19 @@ public class Geocache implements ICache, IWaypoint {
cacheType = other.cacheType;
zoomlevel = other.zoomlevel;
// boolean values must be enumerated here. Other types are assigned outside this if-statement
+ // TODO: check whether a search or a live map systematically returns those, in which case
+ // we want to keep the most recent one instead of getting information from the previously
+ // stored data. This is the case for "archived" for example which has been taken out of this
+ // list.
premiumMembersOnly = other.premiumMembersOnly;
reliableLatLon = other.reliableLatLon;
- archived = other.archived;
found = other.found;
disabled = other.disabled;
favorite = other.favorite;
onWatchlist = other.onWatchlist;
logOffline = other.logOffline;
finalDefined = other.finalDefined;
+ // archived is kept from the most recent data
}
/*