From 35678ff26151991d6492eea2a3d41f589392f6cc Mon Sep 17 00:00:00 2001
From: Brian Hatchl <brian.hatchl@radiantsolutions.com>
Date: Fri, 1 Jun 2018 16:23:33 -0400
Subject: [PATCH] set ignored errors before updating layer validation errors
 and dialog

---
 .../josm/actions/upload/ValidateUploadHook.java    | 24 ++++++++++++----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java b/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java
index c8d4f65..3948c89 100644
--- a/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java
+++ b/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java
@@ -73,17 +73,6 @@ public class ValidateUploadHook implements UploadHook {
                 }
             }
         }
-        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()) {
             int nume = 0;
@@ -104,6 +93,19 @@ public class ValidateUploadHook implements UploadHook {
             if (nume == 0)
                 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);
     }
 
-- 
2.7.4