Changeset 15030 in josm for trunk/src/org

Timestamp:

2019-04-28T04:22:58+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #17301 - robustness to untranslatable error messages

File:

• trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java (modified) (1 diff)

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

@@ -1170 +1170 @@
 
         if (tile.hasError() && getDisplaySettings().isShowErrors()) {
-            String errorMessage = tr(tile.getErrorMessage());
+            String errorMessage = tile.getErrorMessage();
             if (errorMessage != null) {
+                try {
+                    errorMessage = tr(tile.getErrorMessage());
+                } catch (IllegalArgumentException e) {
+                    Logging.debug(e);
+                }
                 if (!errorMessage.startsWith("Error") && !errorMessage.startsWith(tr("Error"))) {
                     errorMessage = tr("Error") + ": " + errorMessage;