Merge branch 'release' (with conflict resolution)

bekuno · Nov 3, 2024 · 95f424d · 95f424d
2 parents 7eb7673 + 486db7f
commit 95f424d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/main/src/main/java/cgeo/geocaching/models/CacheVariableList.java b/main/src/main/java/cgeo/geocaching/models/CacheVariableList.java
@@ -103,6 +103,6 @@ private void addAllWaypointNeededVars(final Set<String> neededVars) {
 
     private boolean recalculateWaypoints() {
         final Geocache cache = DataStore.loadCache(this.geocode, LoadFlags.LOAD_CACHE_OR_DB);
-        return cache.recalculateWaypoints(this);
+        return cache != null && cache.recalculateWaypoints(this);
     }
 }
diff --git a/main/src/main/res/raw/changelog_bugfix.md b/main/src/main/res/raw/changelog_bugfix.md
@@ -1,5 +1,7 @@
 ##
 - Fix: Some issues with new event time detection
+- Fix: Crash when editing variable field
+- Fix: Crash on importing GPX file (workaround)
 
 ##
 - Fix: Missing event times on cache download (website change)