Changeset 13219 in josm for trunk/src/org

Timestamp:

2017-12-18T00:14:48+01:00 (7 years ago)

Author:

Don-vip

Message:

see #15653, see #8509 - fix unit test causing mayhem

File:

• trunk/src/org/openstreetmap/josm/gui/layer/MainLayerManager.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/MainLayerManager.java

@@ -17 +17 @@
 import org.openstreetmap.josm.gui.io.AsynchronousUploadPrimitivesTask;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -426 +427 @@
             activeLayerChangeListeners.clear();
             layerAvailabilityListeners.clear();
-        } else if (!GraphicsEnvironment.isHeadless()) {
-            GuiHelper.runInEDT(() -> JOptionPane.showMessageDialog(MainApplication.parent,
-                    tr("A background upload is already in progress. Cannot reset state until the upload is finished.")));
+        } else {
+            String msg = tr("A background upload is already in progress. Cannot reset state until the upload is finished.");
+            Logging.warn(msg);
+            if (!GraphicsEnvironment.isHeadless()) {
+                GuiHelper.runInEDT(() -> JOptionPane.showMessageDialog(MainApplication.parent, msg));
+            }
         }
     }