Fix for issue 7287 (#7290)

JabRef · Jan 4, 2021 · a69bb58 · a69bb58
1 parent eff250b
commit a69bb58
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/main/java/org/jabref/gui/JabRefDialogService.java b/src/main/java/org/jabref/gui/JabRefDialogService.java
@@ -274,7 +274,9 @@ public Optional<ButtonType> showCustomDialogAndWait(String title, DialogPane con
 
     @Override
     public <R> Optional<R> showCustomDialogAndWait(javafx.scene.control.Dialog<R> dialog) {
-        dialog.initOwner(mainWindow);
+        if (dialog.getOwner() == null) {
+            dialog.initOwner(mainWindow);
+        }
         return dialog.showAndWait();
     }
 
@@ -398,7 +400,9 @@ public Optional<Path> showFileOpenFromArchiveDialog(Path archivePath) throws IOE
 
     @Override
     public void showCustomDialog(BaseDialog<?> aboutDialogView) {
-        aboutDialogView.initOwner(mainWindow);
+        if (aboutDialogView.getOwner() == null) {
+            aboutDialogView.initOwner(mainWindow);
+        }
         aboutDialogView.show();
     }
 }