Changeset 8785 in josm for trunk/src

Timestamp:

2015-09-22T21:30:03+02:00 (9 years ago)

Author:

simon04

Message:

see #11852 - Disallow resolving null coordinate in conflict dialog

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java

@@ -404 +404 @@
         @Override
         public void update(Observable o, Object arg) {
-            setEnabled(model.hasCoordConflict() && !model.isDecidedCoord());
+            setEnabled(model.hasCoordConflict() && !model.isDecidedCoord() && model.getMyCoords() != null);
         }
     }
@@ -421 +421 @@
         @Override
         public void update(Observable o, Object arg) {
-            setEnabled(model.hasCoordConflict() && !model.isDecidedCoord());
+            setEnabled(model.hasCoordConflict() && !model.isDecidedCoord() && model.getTheirCoords() != null);
         }
     }