Changeset 8785 in josm
- Timestamp:
- 2015-09-22T21:30:03+02:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java
r8510 r8785 404 404 @Override 405 405 public void update(Observable o, Object arg) { 406 setEnabled(model.hasCoordConflict() && !model.isDecidedCoord() );406 setEnabled(model.hasCoordConflict() && !model.isDecidedCoord() && model.getMyCoords() != null); 407 407 } 408 408 } … … 421 421 @Override 422 422 public void update(Observable o, Object arg) { 423 setEnabled(model.hasCoordConflict() && !model.isDecidedCoord() );423 setEnabled(model.hasCoordConflict() && !model.isDecidedCoord() && model.getTheirCoords() != null); 424 424 } 425 425 }
Note:
See TracChangeset
for help on using the changeset viewer.