aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/com/itmill/toolkit/ui/AbstractSelect.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/itmill/toolkit/ui/AbstractSelect.java b/src/com/itmill/toolkit/ui/AbstractSelect.java
index b56c1752bd..9c0523e02e 100644
--- a/src/com/itmill/toolkit/ui/AbstractSelect.java
+++ b/src/com/itmill/toolkit/ui/AbstractSelect.java
@@ -1633,7 +1633,7 @@ public abstract class AbstractSelect extends AbstractField implements
case ITEM_CAPTION_MODE_PROPERTY:
final Property p = getContainerProperty(itemId,
getItemCaptionPropertyId());
- if (p != null || p instanceof Property.ValueChangeNotifier) {
+ if (p != null && p instanceof Property.ValueChangeNotifier) {
((Property.ValueChangeNotifier) p)
.addListener(getCaptionChangeListener());
captionChangeNotifiers.add(p);