Changeset 3423 in josm for trunk/src/org/openstreetmap/josm/io/OsmReader.java

Timestamp:

2010-08-08T13:48:26+02:00 (14 years ago)

Author:

stoecker

Message:

fix #5221 - patch by Upliner - errors in conflict manager

File:

• trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/OsmReader.java

@@ -379 +379 @@
             } else if (action.equals("delete")) {
                 current.setDeleted(true);
-                current.setModified(true);
+                current.setModified(current.isVisible());
             } else if (action.equals("modify")) {
                 current.setModified(true);