Changeset 11703 in josm for trunk/src/org
- Timestamp:
- 2017-03-08T23:10:19+01:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java
r11690 r11703 121 121 private ImageryReader reader; 122 122 private boolean canceled; 123 private boolean loadError; 123 124 124 125 DefaultEntryLoader(boolean clearCache, boolean fastFail) { … … 161 162 newLayers.addAll(result); 162 163 } catch (IOException ex) { 164 loadError = true; 163 165 Main.error(ex, false); 164 166 } catch (SAXException ex) { 167 loadError = true; 165 168 Main.error(ex); 166 169 } … … 184 187 updateEntriesFromDefaults(); 185 188 buildIdMap(layers, layerIds); 186 dropOldEntries(); 189 if (!loadError && !defaultLayerIds.isEmpty()) { 190 dropOldEntries(); 191 } 187 192 } 188 193 } … … 273 278 List<String> drop = new ArrayList<>(); 274 279 275 if (defaultLayerIds.isEmpty()) {276 return;277 }278 279 280 for (Map.Entry<String, ImageryInfo> info : layerIds.entrySet()) { 280 281 if (!defaultLayerIds.containsKey(info.getKey())) {
Note:
See TracChangeset
for help on using the changeset viewer.