Changeset 13151 in josm for trunk/src

Timestamp:

2017-11-23T15:36:02+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #15585 - NPE

File:

• trunk/src/org/openstreetmap/josm/actions/AbstractPasteAction.java (modified) (2 diffs)

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

@@ -4 +4 @@
 import java.awt.MouseInfo;
 import java.awt.Point;
+import java.awt.PointerInfo;
 import java.awt.datatransfer.FlavorEvent;
 import java.awt.datatransfer.FlavorListener;
@@ -75 +76 @@
         // Observed behaviour: getActionCommand() returns Action.NAME when triggered via menu, but shortcut text when triggered with it
         if (e != null && !getValue(NAME).equals(e.getActionCommand())) {
-            final Point mp = MouseInfo.getPointerInfo().getLocation();
-            final Point tl = mapView.getLocationOnScreen();
-            final Point pos = new Point(mp.x-tl.x, mp.y-tl.y);
-            if (mapView.contains(pos)) {
-                mPosition = mapView.getEastNorth(pos.x, pos.y);
+            final PointerInfo pointerInfo = MouseInfo.getPointerInfo();
+            if (pointerInfo != null) {
+                final Point mp = pointerInfo.getLocation();
+                final Point tl = mapView.getLocationOnScreen();
+                final Point pos = new Point(mp.x-tl.x, mp.y-tl.y);
+                if (mapView.contains(pos)) {
+                    mPosition = mapView.getEastNorth(pos.x, pos.y);
+                }
             }
         }