From 2ab3e1fecaf95a7a126cd7fea4ad12976c442ab2 Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Tue, 13 Sep 2011 12:21:47 +0200
Subject: Reinstate null check

The null check was inadvertently removed during the renaming.
---
 src/cgeo/geocaching/cgCache.java | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/cgeo/geocaching/cgCache.java')

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