From b95f74ed406e372f93f374aff4072efd5e80cde9 Mon Sep 17 00:00:00 2001 From: Joerg Lenhard Date: Mon, 3 Apr 2017 16:27:09 +0200 Subject: [PATCH 1/2] Make sure that JavaFx shuts down in case another JabRef instance is already open --- src/main/java/org/jabref/JabRefMain.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/org/jabref/JabRefMain.java b/src/main/java/org/jabref/JabRefMain.java index e3504a9fd45..cf7b1440b24 100644 --- a/src/main/java/org/jabref/JabRefMain.java +++ b/src/main/java/org/jabref/JabRefMain.java @@ -116,6 +116,8 @@ private static void start(String[] args) { // So we assume it's all taken care of, and quit. LOGGER.info(Localization.lang("Arguments passed on to running JabRef instance. Shutting down.")); Globals.shutdownThreadPools(); + // needed to tell JavaFx to stop + Platform.exit(); return; } } From 9715fe9deb6634dd419caa31674f4160a1db03c8 Mon Sep 17 00:00:00 2001 From: Joerg Lenhard Date: Mon, 3 Apr 2017 16:46:04 +0200 Subject: [PATCH 2/2] Add changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 584711a81be..bc7848cae18 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -66,6 +66,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `# - The `day` part of the biblatex `date` field is now exported to the corresponding `day` field in MS-Office XML. [#2691](https://github.com/JabRef/jabref/issues/2691) ### Fixed + - We fixed an issue that prevented multiple parallel JabRef instances from terminating gracefully. [#2698](https://github.com/JabRef/jabref/issues/2698) - We fixed an issue where authors with multiple surnames were not presented correctly in the main table. [#2534](https://github.com/JabRef/jabref/issues/2534) - Repairs the handling of apostrophes in the LaTeX to unicode conversion. [#2500](https://github.com/JabRef/jabref/issues/2500) - Fix import of journal title in ris format. [#2506](https://github.com/JabRef/jabref/issues/2506)