Changeset 9797 in josm for trunk

Timestamp:

2016-02-14T19:08:23+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #12531 - NPE when importing notes files (regression from r9746)

Location:

trunk

Files:

• src/org/openstreetmap/josm/io/NoteImporter.java (modified) (1 diff)
• test/data/regress/12531 (added)
• test/data/regress/12531/notes.osn (added)
• test/unit/org/openstreetmap/josm/io/NoteImporterTest.java (added)

trunk/src/org/openstreetmap/josm/io/NoteImporter.java

@@ -38 +38 @@
         try (InputStream is = Compression.getUncompressedFileInputStream(file)) {
             final NoteLayer layer = loadLayer(is, file, file.getName(), progressMonitor);
-            if (!Main.map.mapView.hasLayer(layer)) {
+            if (Main.map == null || !Main.map.mapView.hasLayer(layer)) {
                 GuiHelper.runInEDT(new Runnable() {
                     @Override