Changeset 2131 in josm for trunk/src


Ignore:
Timestamp:
2009-09-14T20:32:12+02:00 (15 years ago)
Author:
Gubaer
Message:

see #3407: NPE in ConflictDialog when using OpenStreetBug plugin

File:
1 edited

Legend:

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

    r1937 r2131  
    196196        };
    197197        for (Object o : lstConflicts.getSelectedValues()) {
    198             if (!conflicts.hasConflictForMy((OsmPrimitive)o)) {
     198            if (conflicts == null || !conflicts.hasConflictForMy((OsmPrimitive)o)) {
    199199                continue;
    200200            }
     
    252252        lstConflicts.clearSelection();
    253253        for (OsmPrimitive osm : newSelection) {
    254             if (conflicts.hasConflictForMy(osm)) {
     254            if (conflicts != null && conflicts.hasConflictForMy(osm)) {
    255255                int pos = model.indexOf(osm);
    256256                if (pos >= 0) {
Note: See TracChangeset for help on using the changeset viewer.