Fix cancelling ignored when generating an entry from id (#10727)

* Fix cancelling ignored when generating an entry from id * Add changelog entry
JabRef · Dec 27, 2023 · 23b75db · 23b75db
1 parent 45264bd
commit 23b75db
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,8 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 
 ### Fixed
 
+- We fixed an issue where attempting to cancel the importing/generation of an entry from id is ignored. [#10508](https://github.com/JabRef/jabref/issues/10508)
+
 ### Removed
 
 ## [5.12] – 2023-12-24

diff --git a/src/main/java/org/jabref/gui/EntryTypeView.java b/src/main/java/org/jabref/gui/EntryTypeView.java
@@ -81,6 +81,7 @@ public EntryTypeView(LibraryTab libraryTab, DialogService dialogService, Prefere
                   .setAsDialogPane(this);
 
         ControlHelper.setAction(generateButton, this.getDialogPane(), event -> viewModel.runFetcherWorker());
+        setOnCloseRequest(e -> viewModel.cancelFetcherWorker());
 
         setResultConverter(button -> {
             // The buttonType will always be "cancel", even if we pressed one of the entry type buttons

diff --git a/src/main/java/org/jabref/gui/EntryTypeViewModel.java b/src/main/java/org/jabref/gui/EntryTypeViewModel.java
@@ -211,4 +211,8 @@ public void runFetcherWorker() {
         });
         taskExecutor.execute(fetcherWorker);
     }
+
+    public void cancelFetcherWorker() {
+        fetcherWorker.cancel();
+    }
 }