Changeset 2312 in josm for trunk/src/org/openstreetmap/josm/actions/PasteAction.java

Timestamp:

2009-10-25T13:03:34+01:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3759: NPE on copy-paste between two layers where the origin layer has been deleted
Only happened if you pasted in a new layer the mouse never entered

File:

• trunk/src/org/openstreetmap/josm/actions/PasteAction.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/PasteAction.java

@@ -58 +58 @@
             mPosition = Main.map.mapView.getCenter();
         } else {
-            mPosition = Main.map.mapView.getEastNorth(Main.map.mapView.lastMEvent.getX(), Main.map.mapView.lastMEvent.getY());
+            if (Main.map.mapView.lastMEvent != null) {
+                mPosition = Main.map.mapView.getEastNorth(Main.map.mapView.lastMEvent.getX(), Main.map.mapView.lastMEvent.getY());
+            } else {
+                mPosition = Main.map.mapView.getCenter();
+            }
         }