see #21319 - fix NPE

git-svn-id: https://josm.openstreetmap.de/svn/trunk@18222 0c6e7542-c601-0410-84e7-c038aed88b3b
JOSM · Sep 12, 2021 · 558443b · 558443b
1 parent 1229623
commit 558443b
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java b/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java
@@ -452,8 +452,9 @@ public boolean ok() {
 
         setProjection(id, prefs, false);
 
-        if (PROP_COORDINATES.put(((ICoordinateFormat) coordinatesCombo.getSelectedItem()).getId())) {
-            CoordinateFormatManager.setCoordinateFormat((ICoordinateFormat) coordinatesCombo.getSelectedItem());
+        ICoordinateFormat selectedItem = (ICoordinateFormat) coordinatesCombo.getSelectedItem();
+        if (selectedItem != null && PROP_COORDINATES.put(selectedItem.getId())) {
+            CoordinateFormatManager.setCoordinateFormat(selectedItem);
         }
 
         SystemOfMeasurement.setSystemOfMeasurement(((SystemOfMeasurement) unitsCombo.getSelectedItem()));