Changeset 15204 in josm

Timestamp:

2019-07-06T00:52:27+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #17877 - NPE

File:

• trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java (modified) (2 diffs)

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

@@ -550 +550 @@
                 return;
 
-            if (mouseIsDragging(e)) {
+            if (mouseIsDragging(e) && mousePointInImg != null) {
                 Point p = comp2imgCoord(visibleRect, e.getX(), e.getY(), getSize());
                 visibleRect.isDragUpdate = true;
@@ -564 +564 @@
             }
 
-            if (mouseIsZoomSelecting(e)) {
+            if (mouseIsZoomSelecting(e) && mousePointInImg != null) {
                 Point p = comp2imgCoord(visibleRect, e.getX(), e.getY(), getSize());
                 visibleRect.checkPointInside(p);