From: gmungoc Date: Wed, 13 Mar 2019 10:50:39 +0000 (+0000) Subject: JAL-3141 fix up merge artefact so BackupFilesTest passes X-Git-Tag: Develop-2_11_2_0-d20201215~24^2~68^2~234 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=116c74a028f628d907dd82a4d763498042f55a5b;p=jalview.git JAL-3141 fix up merge artefact so BackupFilesTest passes --- diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java index 011610c..a9d5b86 100644 --- a/src/jalview/gui/AlignFrame.java +++ b/src/jalview/gui/AlignFrame.java @@ -1239,7 +1239,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, */ public void saveAlignment(String file, FileFormatI format) { - lastSaveSuccessful = false; + lastSaveSuccessful = true; lastFilenameSaved = file; lastFormatSaved = format; @@ -1292,8 +1292,9 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, BackupFiles backupfiles = new BackupFiles(file); try { - PrintWriter out = new PrintWriter( - new FileWriter(backupfiles.getTempFilePath())); + String tempFilePath = backupfiles.getTempFilePath(); + PrintWriter out = new PrintWriter( + new FileWriter(tempFilePath)); out.print(output); out.close();