Fixes #5213, Sometimes NPE in SaveWaypoint

- check for valid state before attempting save

1 files changed, 5 insertions, 0 deletions

diff --git a/main/src/cgeo/geocaching/EditWaypointActivity.java b/main/src/cgeo/geocaching/EditWaypointActivity.java
index 062ceca..25f3acd 100644
--- a/main/src/cgeo/geocaching/EditWaypointActivity.java
+++ b/main/src/cgeo/geocaching/EditWaypointActivity.java
@@ -516,6 +516,11 @@ public class EditWaypointActivity extends AbstractActionBarActivity implements C
 
             @Override
             protected Void doInBackground(final Void... params) {
+                // currentState might be null here if there is a problem with the waypoints data
+                if (currentState == null) {
+                    finishHandler.sendEmptyMessage(SAVE_ERROR);
+                    return null;
+                }
                 final Waypoint waypoint = new Waypoint(currentState.name, currentState.type, own);
                 waypoint.setGeocode(geocode);
                 waypoint.setPrefix(prefix);