Changeset 8987 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2015-11-04T18:15:15+01:00 (8 years ago)

Author:

simon04

Message:

fix #12059 - NPE when converting GPX layer to data-layer from session.joz

Regression from r8830.

File:

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

trunk/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java

@@ -130 +130 @@
         final DataSet ds = convert();
         final OsmDataLayer layer = new OsmDataLayer(ds, tr("Converted from: {0}", this.layer.getName()), null);
-        layer.setAssociatedFile(new File(this.layer.getAssociatedFile().getParentFile(), this.layer.getAssociatedFile().getName() + ".osm"));
+        if (this.layer.getAssociatedFile() != null) {
+            layer.setAssociatedFile(new File(this.layer.getAssociatedFile().getParentFile(), this.layer.getAssociatedFile().getName() + ".osm"));
+        }
         layer.setUploadDiscouraged(true);
         Main.main.addLayer(layer);