aboutsummaryrefslogtreecommitdiffstats
path: root/src/cgeo/geocaching/cgCache.java
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2011-09-13 12:21:47 +0200
committerSamuel Tardieu <sam@rfc1149.net>2011-09-13 12:21:47 +0200
commit2ab3e1fecaf95a7a126cd7fea4ad12976c442ab2 (patch)
treec0dee3af4a660de063e07ba0ea9cfb9ca923a53e /src/cgeo/geocaching/cgCache.java
parentac1c117d59db84827db38f87c242122e06510e2d (diff)
downloadcgeo-2ab3e1fecaf95a7a126cd7fea4ad12976c442ab2.zip
cgeo-2ab3e1fecaf95a7a126cd7fea4ad12976c442ab2.tar.gz
cgeo-2ab3e1fecaf95a7a126cd7fea4ad12976c442ab2.tar.bz2
Reinstate null check
The null check was inadvertently removed during the renaming.
Diffstat (limited to 'src/cgeo/geocaching/cgCache.java')
-rw-r--r--src/cgeo/geocaching/cgCache.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/cgeo/geocaching/cgCache.java b/src/cgeo/geocaching/cgCache.java
index f4e7c3b..5a48875 100644
--- a/src/cgeo/geocaching/cgCache.java
+++ b/src/cgeo/geocaching/cgCache.java
@@ -90,6 +90,10 @@ public class cgCache implements ICache {
* @param other the other version, or null if non-existent
*/
public void gatherMissingFrom(final cgCache other) {
+ if (other == null) {
+ return;
+ }
+
updated = System.currentTimeMillis();
if (detailed == false && other.detailed) {
detailed = true;