Changeset 9797 in josm for trunk


Ignore:
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:
3 added
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/io/NoteImporter.java

    r9748 r9797  
    3838        try (InputStream is = Compression.getUncompressedFileInputStream(file)) {
    3939            final NoteLayer layer = loadLayer(is, file, file.getName(), progressMonitor);
    40             if (!Main.map.mapView.hasLayer(layer)) {
     40            if (Main.map == null || !Main.map.mapView.hasLayer(layer)) {
    4141                GuiHelper.runInEDT(new Runnable() {
    4242                    @Override
Note: See TracChangeset for help on using the changeset viewer.