changeset 11246:b1b8c9c65c2a

Merge
author kcr
date Tue, 16 Apr 2019 12:02:22 -0700
parents d13a6227b543 bdf63f7632c1
children 01da8b583966
files
diffstat 1 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/modules/javafx.graphics/src/main/java/javafx/stage/Window.java	Mon Apr 15 11:15:07 2019 -0700
+++ b/modules/javafx.graphics/src/main/java/javafx/stage/Window.java	Tue Apr 16 12:02:22 2019 -0700
@@ -1531,6 +1531,10 @@
 
         public void apply() {
             if (dirty) {
+                if (peer == null) {
+                    reset();
+                    return;
+                }
                 // Snapshot values and then reset() before we call down
                 // as we may end up with recursive calls back up with
                 // new values that must be recorded as dirty.
@@ -1548,9 +1552,9 @@
                 float newRY = (float) renderScaleY;
                 reset();
                 peer.setBounds(newX, newY, xSet, ySet,
-                                    newWW, newWH, newCW, newCH,
-                                    newXG, newYG,
-                                    newRX, newRY);
+                        newWW, newWH, newCW, newCH,
+                        newXG, newYG,
+                        newRX, newRY);
             }
         }