Changeset 7784 in josm for trunk


Ignore:
Timestamp:
2014-12-10T22:19:51+01:00 (5 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

    r7764 r7784  
    401401
    402402        setName(l.getName());
     403        thumbsLoaded &= l.thumbsLoaded;
    403404    }
    404405
  • trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java

    r7005 r7784  
    4141            if (stop) return;
    4242
    43             data.get(i).thumbnail = loadThumb(data.get(i));
     43            // Do not load thumbnails that were loaded before.
     44            if (data.get(i).thumbnail == null) {
     45                data.get(i).thumbnail = loadThumb(data.get(i));
    4446
    45             if (Main.isDisplayingMapView()) {
    46                 layer.updateOffscreenBuffer = true;
    47                 Main.map.mapView.repaint();
     47                if (Main.isDisplayingMapView()) {
     48                    layer.updateOffscreenBuffer = true;
     49                    Main.map.mapView.repaint();
     50                }
    4851            }
    4952        }
Note: See TracChangeset for help on using the changeset viewer.