Changeset 9632 in josm


Ignore:
Timestamp:
2016-01-25T23:42:17+01:00 (5 years ago)
Author:
Don-vip
Message:

fix #12443 - NPE (regression from r9588, see #12412)

Location:
trunk
Files:
1 added
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java

    r9623 r9632  
    441441
    442442    RelationMember getRelationMemberForPrimitive(final OsmPrimitive primitive) {
    443         final Collection<TaggingPreset> presets = TaggingPresets.getMatchingPresets(EnumSet.of(TaggingPresetType.forPrimitive(relation)),
     443        final Collection<TaggingPreset> presets = TaggingPresets.getMatchingPresets(
     444                EnumSet.of(relation != null ? TaggingPresetType.forPrimitive(relation) : TaggingPresetType.RELATION),
    444445                presetHandler.getSelection().iterator().next().getKeys(), false);
    445446        Collection<String> potentialRoles = new TreeSet<>();
Note: See TracChangeset for help on using the changeset viewer.