Changeset 7784 in josm for trunk/src

Timestamp:

2014-12-10T22:19:51+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #10811 - Handle GeoImageLayer thumbnail load status during layer merge (patch by holgermappt)

Location:

trunk/src/org/openstreetmap/josm/gui/layer/geoimage

Files:

• GeoImageLayer.java (modified) (1 diff)
• ThumbsLoader.java (modified) (1 diff)

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

@@ -401 +401 @@
 
         setName(l.getName());
+        thumbsLoaded &= l.thumbsLoaded;
     }
 

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

@@ -41 +41 @@
             if (stop) return;
 
-            data.get(i).thumbnail = loadThumb(data.get(i));
+            // Do not load thumbnails that were loaded before.
+            if (data.get(i).thumbnail == null) {
+                data.get(i).thumbnail = loadThumb(data.get(i));
 
-            if (Main.isDisplayingMapView()) {
-                layer.updateOffscreenBuffer = true;
-                Main.map.mapView.repaint();
+                if (Main.isDisplayingMapView()) {
+                    layer.updateOffscreenBuffer = true;
+                    Main.map.mapView.repaint();
+                }
             }
         }