diff options
author | Bananeweizen <Bananeweizen@gmx.de> | 2012-11-29 22:18:32 -0800 |
---|---|---|
committer | Bananeweizen <Bananeweizen@gmx.de> | 2012-11-29 22:18:32 -0800 |
commit | fbb617083e1c1c8cd1c6465e4572ecf462f202bb (patch) | |
tree | 30f5644a38bc88a8a14ffd1fd16440d327bb4f0f /main/src/cgeo/geocaching | |
parent | 9a2a56f87a00be1fe8c717c09a3d539128904e11 (diff) | |
parent | f82dd23fa9c4269abfab6e27bcf54ff4bc2fbc5d (diff) | |
download | cgeo-fbb617083e1c1c8cd1c6465e4572ecf462f202bb.zip cgeo-fbb617083e1c1c8cd1c6465e4572ecf462f202bb.tar.gz cgeo-fbb617083e1c1c8cd1c6465e4572ecf462f202bb.tar.bz2 |
Merge pull request #2212 from marco-jacob/fixFinalFlagNew
fix finalDefined flag vanishing on list item refresh
Diffstat (limited to 'main/src/cgeo/geocaching')
-rw-r--r-- | main/src/cgeo/geocaching/cgCache.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/src/cgeo/geocaching/cgCache.java b/main/src/cgeo/geocaching/cgCache.java index 230e84e..dfc18ab 100644 --- a/main/src/cgeo/geocaching/cgCache.java +++ b/main/src/cgeo/geocaching/cgCache.java @@ -294,12 +294,12 @@ public class cgCache implements ICache, IWaypoint { attributes.set(other.attributes); } if (waypoints.isEmpty()) { - waypoints.set(other.waypoints); + this.setWaypoints(other.waypoints.asList(), false); } else { ArrayList<cgWaypoint> newPoints = new ArrayList<cgWaypoint>(waypoints.asList()); - cgWaypoint.mergeWayPoints(newPoints, other.getWaypoints(), false); - waypoints.set(newPoints); + cgWaypoint.mergeWayPoints(newPoints, other.waypoints.asList(), false); + this.setWaypoints(newPoints, false); } if (spoilers == null) { spoilers = other.spoilers; |