From 269a7868b912cc3046a4de6dbb9c6337eac6658b Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sat, 19 Oct 2019 12:45:23 +0200
Subject: [PATCH 1/2] Fix not on fx thread error for custom entry types

Revert change done in  #5423 because the actual code just opens the already loaded databases
at this point the databases are already loaded in a background thread
---
 src/main/java/org/jabref/JabRefGUI.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/jabref/JabRefGUI.java b/src/main/java/org/jabref/JabRefGUI.java
index 84c216c4d1b..6d6c2d6720d 100644
--- a/src/main/java/org/jabref/JabRefGUI.java
+++ b/src/main/java/org/jabref/JabRefGUI.java
@@ -41,12 +41,10 @@ public class JabRefGUI {
     private final boolean isBlank;
     private final List<ParserResult> failed = new ArrayList<>();
     private final List<ParserResult> toOpenTab = new ArrayList<>();
-    private final JabRefExecutorService executorService;
 
     public JabRefGUI(Stage mainStage, List<ParserResult> databases, boolean isBlank) {
         this.bibDatabases = databases;
         this.isBlank = isBlank;
-        executorService = JabRefExecutorService.INSTANCE;
         mainFrame = new JabRefFrame(mainStage);
 
         openWindow(mainStage);
@@ -89,8 +87,7 @@ private void openWindow(Stage mainStage) {
                 event.consume();
             }
         });
-
-        executorService.execute(this::openDatabases);
+        this.openDatabases();
     }
 
     private void openDatabases() {
@@ -176,6 +173,7 @@ private void openDatabases() {
         for (int i = 0; (i < bibDatabases.size()) && (i < mainFrame.getBasePanelCount()); i++) {
             ParserResult pr = bibDatabases.get(i);
             BasePanel panel = mainFrame.getBasePanelAt(i);
+
             OpenDatabaseAction.performPostOpenActions(panel, pr);
         }
 

From 37d4ca1f823c26ae624c5cf3fdda0a44c4b5cdb0 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Mon, 21 Oct 2019 20:20:47 +0200
Subject: [PATCH 2/2] Use Platform.runLater

---
 src/main/java/org/jabref/JabRefGUI.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/jabref/JabRefGUI.java b/src/main/java/org/jabref/JabRefGUI.java
index 6d6c2d6720d..e5070ca912b 100644
--- a/src/main/java/org/jabref/JabRefGUI.java
+++ b/src/main/java/org/jabref/JabRefGUI.java
@@ -6,6 +6,7 @@
 import java.util.Iterator;
 import java.util.List;
 
+import javafx.application.Platform;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
 
@@ -87,7 +88,7 @@ private void openWindow(Stage mainStage) {
                 event.consume();
             }
         });
-        this.openDatabases();
+        Platform.runLater(this::openDatabases);
     }
 
     private void openDatabases() {