Changeset 8785 in josm


Ignore:
Timestamp:
2015-09-22T21:30:03+02:00 (7 years ago)
Author:
simon04
Message:

see #11852 - Disallow resolving null coordinate in conflict dialog

File:
1 edited

Legend:

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

    r8510 r8785  
    404404        @Override
    405405        public void update(Observable o, Object arg) {
    406             setEnabled(model.hasCoordConflict() && !model.isDecidedCoord());
     406            setEnabled(model.hasCoordConflict() && !model.isDecidedCoord() && model.getMyCoords() != null);
    407407        }
    408408    }
     
    421421        @Override
    422422        public void update(Observable o, Object arg) {
    423             setEnabled(model.hasCoordConflict() && !model.isDecidedCoord());
     423            setEnabled(model.hasCoordConflict() && !model.isDecidedCoord() && model.getTheirCoords() != null);
    424424        }
    425425    }
Note: See TracChangeset for help on using the changeset viewer.