Merge remote-tracking branch 'origin/master'

This commit is contained in:
Manfred Karrer 2018-01-03 16:58:54 +01:00
commit c15dda697a
No known key found for this signature in database
GPG key ID: 401250966A6B2C46

View file

@ -146,7 +146,7 @@ public class BackupView extends ActivatableView<GridPane, Void> {
String backupDirectory = preferences.getBackupDirectory();
if (backupDirectory != null && backupDirectory.length() > 0) {
try {
String dateString = new SimpleDateFormat("YYYY-MM-dd-HHmmss").format(new Date());
String dateString = new SimpleDateFormat("yyyy-MM-dd-HHmmss").format(new Date());
String destination = Paths.get(backupDirectory, "bisq_backup_" + dateString).toString();
FileUtils.copyDirectory(dataDir,
new File(destination));