summaryrefslogtreecommitdiffstats
path: root/src/com/vaadin/ui/AbstractComponent.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/vaadin/ui/AbstractComponent.java')
-rw-r--r--src/com/vaadin/ui/AbstractComponent.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/vaadin/ui/AbstractComponent.java b/src/com/vaadin/ui/AbstractComponent.java
index 550ffbef0b..de1515d856 100644
--- a/src/com/vaadin/ui/AbstractComponent.java
+++ b/src/com/vaadin/ui/AbstractComponent.java
@@ -368,7 +368,8 @@ public abstract class AbstractComponent implements Component, MethodEventSource
// is set visible again. This workaround is needed as isEnabled
// checks isVisible.
boolean needRepaint = (wasEnabledInContext != isEnabledInContext)
- || (wasEnabled != isEnabled && !parent.isVisible());
+ || (wasEnabled != isEnabled && (getParent() == null || !getParent()
+ .isVisible()));
if (needRepaint) {
requestRepaint();