Fix Dialog Close Verhalten (#319)

openjverein · Sep 10, 2024 · 745cc5c · 745cc5c
1 parent 43827a8
commit 745cc5c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/src/de/jost_net/JVerein/gui/action/HibiscusKontenImportAction.java b/src/de/jost_net/JVerein/gui/action/HibiscusKontenImportAction.java
@@ -55,18 +55,17 @@ public void handleAction(Object context) throws ApplicationException
       }
       catch (OperationCanceledException oce)
       {
-        GUI.getStatusBar().setErrorText("Vorgang abgebrochen");
-        return;
+        throw oce;
       }
       catch (Exception e)
       {
-        Logger.error("error while choosing konto", e);
+        Logger.error("Error while choosing konto", e);
         GUI.getStatusBar().setErrorText("Fehler bei der Auswahl des Kontos.");
       }
     }
 
     if (context == null || !(context instanceof Konto))
-      throw new ApplicationException("Kein Konto ausgewählt");
+      return;
 
     final Konto k = (Konto) context;
     try

diff --git a/src/de/jost_net/JVerein/gui/control/BuchungsControl.java b/src/de/jost_net/JVerein/gui/control/BuchungsControl.java
@@ -1521,6 +1521,8 @@ private void starteAuswertungBuchungsjournal()
 
       // 20220823: sbuer: Statische Variablen fuer neue Sortiermöglichkeiten
       String sort = djs.open();
+      if (djs.getClosed())
+        return;
       query.setOrdername(sort);
 
       FileDialog fd = new FileDialog(GUI.getShell(), SWT.SAVE);

diff --git a/src/de/jost_net/JVerein/gui/dialogs/BuchungsjournalSortDialog.java b/src/de/jost_net/JVerein/gui/dialogs/BuchungsjournalSortDialog.java
@@ -52,9 +52,11 @@ public class BuchungsjournalSortDialog extends AbstractDialog<String>
   public final static String DATUM_BLATTNUMMER_ID = "Datum, Blattnummer, Id";
   public final static String DATUM_AUSGZUGSNUMMER_BLATTNUMMER_ID = "Datum, Auszugsnummer, Blattnummer, Id";
 
-  private String selected = DATUM;
+  private String selected = DATUM_AUSGZUGSNUMMER_BLATTNUMMER_ID;
 
   private SelectInput sortierung = null;
+
+  private boolean closed = true;
 
   public BuchungsjournalSortDialog(int position)
   {
@@ -75,6 +77,7 @@ protected void paint(Composite parent) throws Exception
       @Override
       public void handleAction(Object context)
       {
+        closed = false;
         close();
       }
     }, null, false, "go-next.png");
@@ -120,4 +123,9 @@ public void handleEvent(Event event)
     });
     return this.sortierung;
   }
+
+  public boolean getClosed()
+  {
+    return closed;
+  }
 }