X-Git-Url: http://gitweb.fperrin.net/?p=GpsPrune.git;a=blobdiff_plain;f=tim%2Fprune%2Fsave%2FFileSaver.java;h=f2ea066179efed753aef009243bc4ab174b12ba5;hp=78fbe3e5d38e49cecc98fee01b360c27e0b154b0;hb=f35b6d628f68e3b5ef19965ad8988d0dd1eb8efa;hpb=3745d70b1427bb8ac1a085e47cbdc566936784e1 diff --git a/tim/prune/save/FileSaver.java b/tim/prune/save/FileSaver.java index 78fbe3e..f2ea066 100644 --- a/tim/prune/save/FileSaver.java +++ b/tim/prune/save/FileSaver.java @@ -500,8 +500,9 @@ public class FileSaver { DataPoint point = track.getPoint(p); boolean savePoint = ((point.isWaypoint() && _pointTypeSelector.getWaypointsSelected()) - || (!point.isWaypoint() && point.getPhoto()==null && _pointTypeSelector.getTrackpointsSelected()) - || (!point.isWaypoint() && point.getPhoto()!=null && _pointTypeSelector.getPhotopointsSelected())) + || (!point.isWaypoint() && !point.hasMedia() && _pointTypeSelector.getTrackpointsSelected()) + || (!point.isWaypoint() && point.getPhoto()!=null && _pointTypeSelector.getPhotopointsSelected()) + || (!point.isWaypoint() && point.getAudio()!=null && _pointTypeSelector.getAudiopointsSelected())) && (!_pointTypeSelector.getJustSelection() || (p>=selStart && p<=selEnd)); if (!savePoint) {continue;} numSaved++; @@ -512,9 +513,8 @@ public class FileSaver info = _model.getFieldInfo(f); if (info.isSelected()) { - if (!firstField) - { - // output field separator + // output field separator + if (!firstField) { buffer.append(delimiter); } saveField(buffer, point, info.getField(), coordFormat, altitudeFormat, timestampFormat);