Fixed regression caused by [7930] (VFilterSelect crashed in IE).

svn changeset:7950/svn branch:6.0

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
index 230ef3b44bcdbcb6db19198f95c9e2c53abbb857..4b13c22cce06f217a5b578f9885b11adf5092733 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
@@ -1028,7 +1028,8 @@ public class VFilterSelect extends Composite implements Paintable, Field,
     private void setTextboxWidth(int componentWidth) {
         int padding = getTextboxPadding();
         int popupOpenerWidth = Util.getRequiredWidth(popupOpener);
-        int iconWidth = Util.getRequiredWidth(selectedItemIcon);
+        int iconWidth = selectedItemIcon.isAttached() ? Util
+                .getRequiredWidth(selectedItemIcon) : 0;
         int textboxWidth = componentWidth - padding - popupOpenerWidth
                 - iconWidth;
         if (textboxWidth < 0) {