Changeset 3061 in josm for trunk


Ignore:
Timestamp:
2010-02-28T20:05:49+01:00 (10 years ago)
Author:
jttt
Message:

Fix #4612 delete members while relation dialog is open leads to data integrity problem

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java

    r3034 r3061  
    99import java.beans.PropertyChangeSupport;
    1010import java.util.ArrayList;
     11import java.util.Collections;
    1112import java.util.HashMap;
    1213import java.util.List;
     
    179180        theirVisibleState = their.isVisible();
    180181
    181         myReferrers = my.getReferrers();
    182         theirReferrers = their.getReferrers();
     182        myReferrers = my.getDataSet() == null?Collections.<OsmPrimitive>emptyList():my.getReferrers();
     183        theirReferrers = their.getDataSet() == null?Collections.<OsmPrimitive>emptyList():their.getReferrers();
    183184
    184185        coordMergeDecision = UNDECIDED;
Note: See TracChangeset for help on using the changeset viewer.