Merge pull request digital-preservation#393 from digital-preservation…

…/f_encoding fix export dialog
NEONScience · Feb 20, 2020 · 1c2c947 · 1c2c947
2 parents 9068033 + 7e72aec
commit 1c2c947
Show file tree

Hide file tree

Showing 4 changed files with 694 additions and 697 deletions.
diff --git a/droid-swing-ui/src/main/java/uk/gov/nationalarchives/droid/gui/DroidMainFrame.java b/droid-swing-ui/src/main/java/uk/gov/nationalarchives/droid/gui/DroidMainFrame.java
@@ -1547,6 +1547,7 @@ private void export() {
                     public void done(ExportAction action) {
                         try {
                             exportDialog.setVisible(false);
+                            exportDialog.dispose();
                             action.get();
                             JOptionPane.showMessageDialog(DroidMainFrame.this, "Export Complete.", "Export Complete",
                                     JOptionPane.INFORMATION_MESSAGE);

diff --git a/droid-swing-ui/src/main/java/uk/gov/nationalarchives/droid/gui/export/ExportDialog.form b/droid-swing-ui/src/main/java/uk/gov/nationalarchives/droid/gui/export/ExportDialog.form
@@ -129,7 +129,7 @@
                   </Group>
                   <EmptySpace max="32767" attributes="0"/>
                   <Group type="103" groupAlignment="3" attributes="0">
-                      <Component id="cancelButton" alignment="3" min="-2" pref="23" max="-2" attributes="0"/>
+                      <Component id="cancelButton" alignment="3" min="-2" max="-2" attributes="0"/>
                       <Component id="exportButton" alignment="3" min="-2" max="-2" attributes="0"/>
                       <Component id="cmdEncoding" alignment="3" min="-2" max="-2" attributes="0"/>
                       <Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/>