Ticket #2457: GeoImageLayer-imgmix.patch

src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java

@@ -277 +277 @@
         final JDialog dlg = pane.createDialog(Main.parent, e.image+" ("+e.coor.toDisplayString()+")");
         scale.addActionListener(new ActionListener(){
             public void actionPerformed(ActionEvent ev) {
+                final ImageEntry e = data.get(currentImage);
                 p.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
                 if (scale.getModel().isSelected())
                     ((JLabel)vp.getView()).setIcon(loadScaledImage(e.image, Math.max(vp.getWidth(), vp.getHeight())));
@@ -340 +341 @@
             public void componentResized(ComponentEvent ev) {
                 // we ignore the first resize event, as the picture is scaled already on load:
                 if (scale.getModel().isSelected() && !ignoreEvent) {
+                    p.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+                    final ImageEntry e = data.get(currentImage);
                     ((JLabel)vp.getView()).setIcon(loadScaledImage(e.image, Math.max(vp.getWidth(), vp.getHeight())));
+                    p.setCursor(Cursor.getDefaultCursor());
                 }
                 ignoreEvent = false;
             }