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

Timestamp:

2016-01-16T10:28:39+01:00 (8 years ago)

Author:

simon04

Message:

fix #12378 - NPE when converting data layer to gpx

File:

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

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

@@ -746 +746 @@
             final GpxData data = toGpxData();
             final GpxLayer gpxLayer = new GpxLayer(data, tr("Converted from: {0}", getName()));
-            final String filename = getAssociatedFile().getName().replaceAll(Pattern.quote(".gpx.osm") + "$", "") + ".gpx";
-            gpxLayer.setAssociatedFile(new File(getAssociatedFile().getParentFile(), filename));
+            if (getAssociatedFile() != null) {
+                final String filename = getAssociatedFile().getName().replaceAll(Pattern.quote(".gpx.osm") + "$", "") + ".gpx";
+                gpxLayer.setAssociatedFile(new File(getAssociatedFile().getParentFile(), filename));
+            }
             Main.main.addLayer(gpxLayer);
             if (Main.pref.getBoolean("marker.makeautomarkers", true) && !data.waypoints.isEmpty()) {