From a87d2e5b09c50a21cb52acfb1fee3558c7516964 Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Sat, 15 Aug 2020 21:23:14 +0200
Subject: [PATCH] Bugfix: prevent NPE. Fixes #374.

---
 .../opentracks/fragments/StatisticsRecordingFragment.java  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java
index 4294f9ff5..371a3a445 100644
--- a/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java
@@ -333,9 +333,10 @@ public class StatisticsRecordingFragment extends Fragment implements TrackDataLi
                         lastTrackPoint = null;
                     }
 
-                    if (lastTrackPoint != null) {
-                        boolean hasFix = !LocationUtils.isLocationOld(lastTrackPoint.getLocation());
-                        boolean hasGoodFix = TrackPointUtils.fulfillsAccuracy(lastTrackPoint, recordingGpsAccuracy);
+                    TrackPoint trackPoint = lastTrackPoint; //NOTE: There seems to be a race condition; just fix the symptom for now.
+                    if (trackPoint != null) {
+                        boolean hasFix = !LocationUtils.isLocationOld(trackPoint.getLocation());
+                        boolean hasGoodFix = TrackPointUtils.fulfillsAccuracy(trackPoint, recordingGpsAccuracy);
 
                         if (!hasFix || !hasGoodFix) {
                             lastTrackPoint = null;