From: Ben Soares <b.soares@dundee.ac.uk>
Date: Thu, 12 Nov 2020 14:27:51 +0000 (+0000)
Subject: JAL-3628 Error when saving alert box has been moved in develop for JS, adding Platfor... 
X-Git-Tag: Develop-2_11_2_0-d20201215~15^2~26
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=afdbcf676f250e219c25a7009d146a465d08b3d9;hp=5f14ca65f127ffbe8ca3c043ac46730fe5a00423;p=jalview.git

JAL-3628 Error when saving alert box has been moved in develop for JS, adding Platform.isHeadless test to new isSaveAlignmentSuccessful method.
---

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index a5ec3d8..4354ac6 100644
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -1204,11 +1204,20 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
 
     if (!lastSaveSuccessful)
     {
-      JvOptionPane.showInternalMessageDialog(this, MessageManager
-              .formatMessage("label.couldnt_save_file", new Object[]
-              { lastFilenameSaved }),
-              MessageManager.getString("label.error_saving_file"),
-              JvOptionPane.WARNING_MESSAGE);
+      if (!Platform.isHeadless())
+      {
+        JvOptionPane.showInternalMessageDialog(this, MessageManager
+                .formatMessage("label.couldnt_save_file", new Object[]
+                { lastFilenameSaved }),
+                MessageManager.getString("label.error_saving_file"),
+                JvOptionPane.WARNING_MESSAGE);
+      }
+      else
+      {
+        Cache.log.error(MessageManager
+                .formatMessage("label.couldnt_save_file", new Object[]
+                { lastFilenameSaved }));
+      }
     }
     else
     {
@@ -1345,19 +1354,6 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
                             + (lastSaveSuccessful ? "" : "un")
                             + "successfully");
           }
-
-          if (!lastSaveSuccessful)
-          {
-            if (!Platform.isHeadless())
-            {
-              JvOptionPane.showInternalMessageDialog(AlignFrame.this,
-                      MessageManager.formatMessage(
-                              "label.couldnt_save_file", new Object[]
-                              { fileName }),
-                      MessageManager.getString("label.error_saving_file"),
-                      JvOptionPane.WARNING_MESSAGE);
-            }
-          }
         }
       }
     };