diff options
| author | bananeweizen <bananeweizen@gmx.de> | 2011-09-28 10:46:46 +0200 |
|---|---|---|
| committer | bananeweizen <bananeweizen@gmx.de> | 2011-09-28 10:46:46 +0200 |
| commit | 9609bba88d0ba87ae0205ae311f3855871e47a25 (patch) | |
| tree | 1b9751b77457b4cf4f46066ac7cc28887ab86ec5 /main/src/cgeo/geocaching/cgCache.java | |
| parent | 5d84c8409bacae1b0e693ff766d43cc8ead08403 (diff) | |
| download | cgeo-9609bba88d0ba87ae0205ae311f3855871e47a25.zip cgeo-9609bba88d0ba87ae0205ae311f3855871e47a25.tar.gz cgeo-9609bba88d0ba87ae0205ae311f3855871e47a25.tar.bz2 | |
ConcurrentModificationException when merging caches
Diffstat (limited to 'main/src/cgeo/geocaching/cgCache.java')
| -rw-r--r-- | main/src/cgeo/geocaching/cgCache.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/main/src/cgeo/geocaching/cgCache.java b/main/src/cgeo/geocaching/cgCache.java index 6fe7331..0b82da9 100644 --- a/main/src/cgeo/geocaching/cgCache.java +++ b/main/src/cgeo/geocaching/cgCache.java @@ -199,7 +199,9 @@ public class cgCache implements ICache { if (waypoints == null) { waypoints = other.waypoints; } - cgWaypoint.mergeWayPoints(waypoints, other.waypoints); + else { + cgWaypoint.mergeWayPoints(waypoints, other.waypoints); + } if (spoilers == null) { spoilers = other.spoilers; } |