From d0edf3aac560bb61a5c703dd583b894e148afd75 Mon Sep 17 00:00:00 2001 From: HoussemNasri Date: Wed, 27 Dec 2023 00:15:03 +0100 Subject: [PATCH 1/2] Fix cancelling ignored when generating an entry from id --- src/main/java/org/jabref/gui/EntryTypeView.java | 1 + src/main/java/org/jabref/gui/EntryTypeViewModel.java | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/src/main/java/org/jabref/gui/EntryTypeView.java b/src/main/java/org/jabref/gui/EntryTypeView.java index 238d80d7d17..3b10205a547 100644 --- 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 index a197348997a..59d3cbbe217 100644 --- 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(); + } } From 358324d6da754466c8393550163dd8db299b1625 Mon Sep 17 00:00:00 2001 From: HoussemNasri Date: Wed, 27 Dec 2023 00:22:59 +0100 Subject: [PATCH 2/2] Add changelog entry --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8cbe21267e5..b86638d96f8 100644 --- 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