From 44e8cd14914da967aef75fcb7ace8e34037eb715 Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Sun, 9 Jan 2022 19:02:54 +0100
Subject: [PATCH] Bugfix: TrackDataHub should abort processing if stopped.

---
 .../de/dennisguse/opentracks/content/TrackDataHub.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java b/src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java
index b9c43c969..8d88546f3 100644
--- a/src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java
+++ b/src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java
@@ -336,13 +336,13 @@ public class TrackDataHub {
         try (TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(selectedTrackId, next)) {
 
             while (trackPointIterator.hasNext()) {
-                if (!isStarted()) {
-                    break;
-                }
-
                 //Prevents a NPE if stop() is happening while notifyTrackPointsTableUpdate()
                 TrackStatisticsUpdater currentUpdater = trackStatisticsUpdater;
 
+                if (!isStarted()) {
+                    return;
+                }
+
                 trackPoint = trackPointIterator.next();
                 TrackPoint.Id trackPointId = trackPoint.getId();