Changeset 14360 in josm for trunk/src/org

Timestamp:

2018-10-25T21:46:08+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16890, see #16824 - NPE

File:

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

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

@@ -1168 +1168 @@
         if (tile.hasError() && getDisplaySettings().isShowErrors()) {
             String errorMessage = tr(tile.getErrorMessage());
-            if (!errorMessage.startsWith("Error") && !errorMessage.startsWith(tr("Error"))) {
-                errorMessage = tr("Error") + ": " + errorMessage;
-            }
-            myDrawString(g, errorMessage, x + 2, texty);
+            if (errorMessage != null) {
+                if (!errorMessage.startsWith("Error") && !errorMessage.startsWith(tr("Error"))) {
+                    errorMessage = tr("Error") + ": " + errorMessage;
+                }
+                myDrawString(g, errorMessage, x + 2, texty);
+            }
             //texty += 1 + fontHeight;
         }