- Timestamp:
- 2015-10-19T00:46:00+02:00 (9 years ago)
- Location:
- trunk
- Files:
-
- 3 added
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java
r8840 r8904 146 146 if (layer == null) return null; 147 147 if (newLayer || mergeLayer == null) { 148 Main.main.addLayer(layer); 148 if (Main.main != null) { 149 Main.main.addLayer(layer); 150 } 149 151 return layer; 150 152 } else { 151 153 mergeLayer.mergeFrom(layer); 152 Main.map.repaint(); 154 if (Main.map != null) { 155 Main.map.repaint(); 156 } 153 157 return mergeLayer; 154 158 } … … 179 183 } 180 184 181 @Override protected void cancel() { 185 @Override 186 protected void cancel() { 182 187 setCanceled(true); 183 188 if (reader != null) {
Note:
See TracChangeset
for help on using the changeset viewer.