Changeset 8645 in josm for trunk

Timestamp:

2015-08-07T17:15:58+02:00 (9 years ago)

Author:

Don-vip

Message:

fix #11756, fix #11759 - NPEs

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/mapmode/DrawAction.java (modified) (1 diff)
• gui/layer/geoimage/CorrelateGpxWithImages.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -824 +824 @@
         double baseHdg = -1;
         if (previousNode != null) {
-            baseHdg =  Math.toDegrees(previousNode.getEastNorth()
-                    .heading(getCurrentBaseNode().getEastNorth()));
+            EastNorth en = previousNode.getEastNorth();
+            if (en != null) {
+                baseHdg = Math.toDegrees(en.heading(getCurrentBaseNode().getEastNorth()));
+            }
         }
 

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

@@ -155 +155 @@
             case CANCEL:
                 if (yLayer != null) {
-                    for (ImageEntry ie : yLayer.data) {
-                        ie.tmp = null;
+                    if (yLayer.data != null) {
+                        for (ImageEntry ie : yLayer.data) {
+                            ie.tmp = null;
+                        }
                     }
                     yLayer.updateBufferAndRepaint();