diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2013-01-26 21:25:56 +0100 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2013-01-26 21:25:56 +0100 |
| commit | 0e61a06b68cc13dccd95c779fdfa9e3db76a2625 (patch) | |
| tree | d90ed94c7ccff945824d7b4ffd98f5e47c68af98 /main/src/cgeo/geocaching/Waypoint.java | |
| parent | 21ea89cd1268e89b91cfaaf6b34b9a82ffe7eee9 (diff) | |
| download | cgeo-0e61a06b68cc13dccd95c779fdfa9e3db76a2625.zip cgeo-0e61a06b68cc13dccd95c779fdfa9e3db76a2625.tar.gz cgeo-0e61a06b68cc13dccd95c779fdfa9e3db76a2625.tar.bz2 | |
The waypoint id must be kept when merging data
If we want to keep the id stable, then it must be copied over.
Part of fix for #2430.
Diffstat (limited to 'main/src/cgeo/geocaching/Waypoint.java')
| -rw-r--r-- | main/src/cgeo/geocaching/Waypoint.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/main/src/cgeo/geocaching/Waypoint.java b/main/src/cgeo/geocaching/Waypoint.java index 5b1ecab..8209b32 100644 --- a/main/src/cgeo/geocaching/Waypoint.java +++ b/main/src/cgeo/geocaching/Waypoint.java @@ -77,6 +77,9 @@ public class Waypoint implements IWaypoint, Comparable<Waypoint> { note = old.note; } } + if (id < 0) { + id = old.id; + } } public static void mergeWayPoints(List<Waypoint> newPoints, |