From c254a6ec75d5a9171669c14bdd2e2acd984a7770 Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Thu, 3 Aug 2023 19:31:10 +0200
Subject: [PATCH] Bug: GPXExporter - TrackPoint of type SEGMENT_START_AUTOMATIC
 might have no location.

Fixes #1647.
---
 .../opentracks/io/file/exporter/GPXTrackExporter.java     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/GPXTrackExporter.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/GPXTrackExporter.java
index c4485417d..04fd0c977 100644
--- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/GPXTrackExporter.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/GPXTrackExporter.java
@@ -151,8 +151,12 @@ public class GPXTrackExporter implements TrackExporter {
                         if (wroteSegment) writeCloseSegment();
                         writeOpenSegment();
                         wroteSegment = true;
-                        trackDistance = trackDistance.plus(writeTrackPoint(track.getZoneOffset(), trackPoint, sensorPoints, trackDistance));
-                        sensorPoints.clear();
+                        if (trackPoint.hasLocation()) {
+                            trackDistance = trackDistance.plus(writeTrackPoint(track.getZoneOffset(), trackPoint, sensorPoints, trackDistance));
+                            sensorPoints.clear();
+                        } else {
+                            sensorPoints.add(trackPoint);
+                        }
                     }
                     case SENSORPOINT -> sensorPoints.add(trackPoint);
                     case TRACKPOINT -> {