X-Git-Url: http://gitweb.fperrin.net/?p=GpsPrune.git;a=blobdiff_plain;f=tim%2Fprune%2Fsave%2FFileSaver.java;fp=tim%2Fprune%2Fsave%2FFileSaver.java;h=1e199d9e7bb387ee6dafdbdb903772fb4d1ff9ac;hp=ecf61d393907e4085926f0bfbefbfd76076ccc6c;hb=0a2480df5845e2d7190dfdec9b2653b1609e853d;hpb=2154b1969ac2995cca46546f217f53c066b0b749

diff --git a/tim/prune/save/FileSaver.java b/tim/prune/save/FileSaver.java
index ecf61d3..1e199d9 100644
--- a/tim/prune/save/FileSaver.java
+++ b/tim/prune/save/FileSaver.java
@@ -102,17 +102,25 @@ public class FileSaver
 			_dialog.getContentPane().add(makeDialogComponents());
 			_dialog.pack();
 		}
+		// Has the track got media?
+		final boolean hasMedia = _app.getTrackInfo().getPhotoList().hasCorrelatedPhotos()
+			|| _app.getTrackInfo().getAudioList().hasCorrelatedAudios();
 		// Check field list
 		Track track = _app.getTrackInfo().getTrack();
 		FieldList fieldList = track.getFieldList();
 		int numFields = fieldList.getNumFields();
-		_model = new FieldSelectionTableModel(numFields);
+		_model = new FieldSelectionTableModel(numFields + (hasMedia ? 1 : 0));
 		for (int i=0; i<numFields; i++)
 		{
 			Field field = fieldList.getField(i);
 			FieldInfo info = new FieldInfo(field, track.hasData(field));
 			_model.addFieldInfo(info, i);
 		}
+		// Add a field for photos / audio if any present
+		if (hasMedia)
+		{
+			_model.addFieldInfo(new FieldInfo(Field.MEDIA_FILENAME, true), numFields);
+		}
 		// Initialise dialog and show it
 		initDialog(_model, inDefaultDelimiter);
 		_dialog.setVisible(true);
@@ -599,6 +607,13 @@ public class FileSaver
 				inBuffer.append(inPoint.getTimestamp().getText(inTimestampFormat));
 			}
 		}
+		else if (inField == Field.MEDIA_FILENAME)
+		{
+			if (inPoint.hasMedia())
+			{
+				inBuffer.append(inPoint.getMediaName());
+			}
+		}
 		else
 		{
 			String value = inPoint.getFieldValue(inField);