Fix #4895
This commit is contained in:
parent
988e3cf0c0
commit
de4d697945
1 changed files with 4 additions and 6 deletions
|
@ -200,25 +200,23 @@ public class SavingTrackHelper extends SQLiteOpenHelper {
|
|||
File fout = new File(dir, f + ".gpx"); //$NON-NLS-1$
|
||||
if (!data.get(f).isEmpty()) {
|
||||
WptPt pt = data.get(f).findPointToShow();
|
||||
|
||||
File targetDir = dir;
|
||||
if (ctx.getSettings().STORE_TRACKS_IN_MONTHLY_DIRECTORIES.get()) {
|
||||
SimpleDateFormat dateDirFormat = new SimpleDateFormat("yyyy-MM");
|
||||
dateDirFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
|
||||
String dateDirName = dateDirFormat.format(new Date(pt.time));
|
||||
|
||||
File dateDir = new File(dir, dateDirName);
|
||||
dateDir.mkdirs();
|
||||
|
||||
if (dateDir.exists()) {
|
||||
dir = dateDir;
|
||||
targetDir = dateDir;
|
||||
}
|
||||
}
|
||||
|
||||
String fileName = f + "_" + new SimpleDateFormat("HH-mm_EEE", Locale.US).format(new Date(pt.time)); //$NON-NLS-1$
|
||||
fout = new File(dir, fileName + ".gpx"); //$NON-NLS-1$
|
||||
fout = new File(targetDir, fileName + ".gpx"); //$NON-NLS-1$
|
||||
int ind = 1;
|
||||
while (fout.exists()) {
|
||||
fout = new File(dir, fileName + "_" + (++ind) + ".gpx"); //$NON-NLS-1$ //$NON-NLS-2$
|
||||
fout = new File(targetDir, fileName + "_" + (++ind) + ".gpx"); //$NON-NLS-1$ //$NON-NLS-2$
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue