changeset 3313:1c339961b9f3 8.0-b86

Automated merge with ssh://jfxsrc.us.oracle.com//javafx/8.0/scrum/controls/jfx/rt
author David Grieve<david.grieve@oracle.com>
date Wed, 17 Apr 2013 16:09:52 -0400
parents 8f472d7c5b38 8deaa34df225
children f47bd27dd69a 7650c37ba09d 7d73336918f8
files
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/javafx-ui-common/src/com/sun/javafx/css/StyleManager.java	Wed Apr 17 18:45:44 2013 +0100
+++ b/javafx-ui-common/src/com/sun/javafx/css/StyleManager.java	Wed Apr 17 16:09:52 2013 -0400
@@ -384,8 +384,8 @@
                 
                 Reference<Parent> ref = parentIter.next();
                 Parent _parent = ref.get();
-                
-                if (_parent.getScene() == scene || _parent.getScene() == null) {
+
+                if (_parent == null || _parent.getScene() == scene || _parent.getScene() == null) {
                     parentIter.remove();
                 } 
             }