Changeset 18804 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2023-08-13T00:20:18+02:00 (21 months ago)

Author:

taylor.smock

Message:

Fix #23116: Adding a member to a newly created relation will cause an NPE

This was caused by returning a null relation for a new relation.

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

@@ -189 +189 @@
             @Override
             public Collection<OsmPrimitive> getSelection() {
+                // Creating a new relation will open the window. The relation, in that case, will be null.
+                if (getRelation() == null) {
+                    Relation relation = new Relation();
+                    tagEditorPanel.getModel().applyToPrimitive(relation);
+                    memberTableModel.applyToRelation(relation);
+                    return Collections.singletonList(relation);
+                }
                 return Collections.singletonList(getRelation());
             }