JAL-612 - catch hidden OOM related to filling in cut and paste text boxes

[jalview.git] / src / jalview / gui / AlignFrame.java

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 3ac30ae..b0d30a2 100755 (executable)
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -1005,11 +1005,18 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
 
     CutAndPasteTransfer cap = new CutAndPasteTransfer();
     cap.setForInput(null);
+
+    try {
+      cap.setText(new FormatAdapter().formatSequences(e.getActionCommand(),
+            viewport.alignment, omitHidden, viewport.colSel));
     Desktop.addInternalFrame(cap, "Alignment output - "
             + e.getActionCommand(), 600, 500);
+    } catch (OutOfMemoryError oom)
+    {
+      new OOMWarning("Outputting alignment as "+e.getActionCommand(),oom);
+      cap.dispose();
+    }
 
-    cap.setText(new FormatAdapter().formatSequences(e.getActionCommand(),
-            viewport.alignment, omitHidden, viewport.colSel));
   }
 
   /**