Changeset 13295 in josm for trunk

Timestamp:

2018-01-07T23:09:33+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #15709 - apply last patch of cmuelle8

File:

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

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

@@ -308 +308 @@
                 if (tracker.isErrorID(1)) {
                     // the tracker catches OutOfMemory conditions
+                    tracker.removeImage(img);
                     img = null;
+                } else {
+                    tracker.removeImage(img);
                 }
             } else {
@@ -317 +320 @@
                 if (this.entry != ImageDisplay.this.entry) {
                     // The file has changed
-                    tracker.removeImage(img);
                     return;
                 }
@@ -337 +339 @@
                         g.drawImage(img, xform, null);
                         g.dispose();
-                        tracker.removeImage(img);
                         img = rot;
                     }
@@ -351 +352 @@
                 errorLoading = (img == null);
             }
-            tracker.removeImage(img);
             ImageDisplay.this.repaint();
         }