Merge remote-tracking branch 'origin/release'

1 files changed, 5 insertions, 2 deletions

diff --git a/main/src/cgeo/geocaching/TrackableActivity.java b/main/src/cgeo/geocaching/TrackableActivity.java
index a9f508c..45111f6 100644
--- a/main/src/cgeo/geocaching/TrackableActivity.java
+++ b/main/src/cgeo/geocaching/TrackableActivity.java
@@ -612,8 +612,11 @@ public class TrackableActivity extends AbstractViewPagerActivity<TrackableActivi
         // refresh the logs view after coming back from logging a trackable
         if (trackable != null) {
             final Trackable updatedTrackable = DataStore.loadTrackable(trackable.getGeocode());
-            trackable.setLogs(updatedTrackable.getLogs());
-            reinitializeViewPager();
+            // if this activity is resumed after a long time, the trackable might be gone due to regular cleanup
+            if (updatedTrackable != null) {
+                trackable.setLogs(updatedTrackable.getLogs());
+                reinitializeViewPager();
+            }
         }
     }