From 3db399741b0ce098cd930005870bc745cd719c70 Mon Sep 17 00:00:00 2001
From: Benedikt Tutzer <benedikt.tutzer@gmail.com>
Date: Tue, 12 May 2020 13:24:25 +0200
Subject: [PATCH] Improved readability in JabRefFrame

---
 src/main/java/org/jabref/gui/JabRefFrame.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 4d79d4b19a8..67d97243523 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -408,11 +408,12 @@ public boolean quit() {
         the background tasks may make changes themselves that need saving.
          */
         if (stateManager.getAnyTaskRunning().getValue()) {
-            if (!(dialogService.showBackgroundProgressDialogAndWait(
+            Optional<ButtonType> shouldClose = dialogService.showBackgroundProgressDialogAndWait(
                     Localization.lang("Please wait..."),
                     Localization.lang("Waiting for background tasks to finish. Quit anyway?"),
                     stateManager
-            ).orElse(ButtonType.CANCEL) == ButtonType.YES)) {
+            );
+            if (!(shouldClose.isPresent() && shouldClose.get() == ButtonType.YES)) {
                 return false;
             }
         }