From fae2a565900a532f71bb3f746715bc50578cf3d2 Mon Sep 17 00:00:00 2001 From: Fouad Almalki Date: Sun, 20 Oct 2024 14:48:54 +0300 Subject: [PATCH] Prevent NPE when passing stage without scene to Dialog.initOwner --- .../src/main/java/javafx/scene/control/HeavyweightDialog.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/javafx.controls/src/main/java/javafx/scene/control/HeavyweightDialog.java b/modules/javafx.controls/src/main/java/javafx/scene/control/HeavyweightDialog.java index 5744debd3d5..156ed9ee189 100644 --- a/modules/javafx.controls/src/main/java/javafx/scene/control/HeavyweightDialog.java +++ b/modules/javafx.controls/src/main/java/javafx/scene/control/HeavyweightDialog.java @@ -316,7 +316,7 @@ private void updateStageBindings(Window oldOwner, Window newOwner) { stage.renderScaleYProperty().unbind(); Scene oldScene = oldStage.getScene(); - if (scene != null && dialogScene != null) { + if (scene != null && dialogScene != null && oldScene != null) { Bindings.unbindContent(dialogScene.getStylesheets(), oldScene.getStylesheets()); } } @@ -329,7 +329,7 @@ private void updateStageBindings(Window oldOwner, Window newOwner) { stage.renderScaleYProperty().bind(newStage.renderScaleYProperty()); Scene newScene = newStage.getScene(); - if (scene != null && dialogScene != null) { + if (scene != null && dialogScene != null && newScene != null) { Bindings.bindContent(dialogScene.getStylesheets(), newScene.getStylesheets()); } }