Changeset 13893 in josm for trunk/src/org/openstreetmap

Timestamp:

2018-06-04T21:09:00+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16355 - Ignored validation findings reappear on upload (patch by bhatchl)

File:

• trunk/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java

@@ -74 +74 @@
             }
         }
-        OsmDataLayer editLayer = MainApplication.getLayerManager().getEditLayer();
-        if (editLayer != null) {
-            editLayer.validationErrors.clear();
-            editLayer.validationErrors.addAll(errors);
-        }
-        MapFrame map = MainApplication.getMap();
-        if (map != null) {
-            map.validatorDialog.tree.setErrors(errors);
-        }
-        if (errors.isEmpty())
-            return true;
 
         if (ValidatorPrefHelper.PREF_USE_IGNORE.get()) {
@@ -105 +94 @@
                 return true;
         }
+
+        OsmDataLayer editLayer = MainApplication.getLayerManager().getEditLayer();
+        if (editLayer != null) {
+            editLayer.validationErrors.clear();
+            editLayer.validationErrors.addAll(errors);
+        }
+        MapFrame map = MainApplication.getMap();
+        if (map != null) {
+            map.validatorDialog.tree.setErrors(errors);
+        }
+        if (errors.isEmpty())
+            return true;
+
         return displayErrorScreen(errors);
     }