From ea97ff65dfd12324d4edf255455f571521635891 Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Sat, 15 Aug 2020 09:12:19 +0200
Subject: [PATCH] MarkerEditActivity: fixed NPE on orientation change.

---
 .../java/de/dennisguse/opentracks/MarkerEditActivity.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/de/dennisguse/opentracks/MarkerEditActivity.java b/src/main/java/de/dennisguse/opentracks/MarkerEditActivity.java
index e2453b36e..637d1b746 100644
--- a/src/main/java/de/dennisguse/opentracks/MarkerEditActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/MarkerEditActivity.java
@@ -151,7 +151,9 @@ public class MarkerEditActivity extends AbstractActivity {
 
         if (savedInstanceState != null) {
             photoUri = savedInstanceState.getParcelable(BUNDLE_PHOTO_URI);
-            waypoint.setPhotoUrl(photoUri != null ? photoUri.toString() : null);
+            if (waypoint != null) {
+                waypoint.setPhotoUrl(photoUri != null ? photoUri.toString() : null);
+            }
         }
         if (photoUri != null) {
             setWaypointImageView(photoUri);