changeset 5599:a630648b31c2

RT-33984: check if owner scene is null
author David Grieve<david.grieve@oracle.com>
date Thu, 31 Oct 2013 09:26:29 -0400
parents d9ced9ad7de2
children 79894a464923
files modules/graphics/src/main/java/javafx/stage/PopupWindow.java
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/modules/graphics/src/main/java/javafx/stage/PopupWindow.java	Thu Oct 31 12:35:38 2013 +0100
+++ b/modules/graphics/src/main/java/javafx/stage/PopupWindow.java	Thu Oct 31 09:26:29 2013 -0400
@@ -432,8 +432,10 @@
         
         // RT-28447
         final Scene ownerScene = getRootWindow(owner).getScene();
-        sceneValue.getStylesheets().setAll(ownerScene.getStylesheets());
-        
+        if (ownerScene != null) {
+            sceneValue.getStylesheets().setAll(ownerScene.getStylesheets());
+        }
+
         // It is required that the root window exist and be visible to show the popup.
         if (getRootWindow(owner).isShowing()) {
             // We do show() first so that the width and height of the