From 0e61a06b68cc13dccd95c779fdfa9e3db76a2625 Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Sat, 26 Jan 2013 21:25:56 +0100
Subject: 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.
---
 main/src/cgeo/geocaching/Waypoint.java | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'main/src/cgeo/geocaching/Waypoint.java')

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,
-- 
cgit v1.1