[merge from 6.7] #4353 ComboBox.removeAllItems did not remove selected icon: additional fix to avoid changing undefined width combobox initial width

svn changeset:23031/svn branch:6.8

1 files changed, 4 insertions, 2 deletions

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
index 2a1e69f68c..8362d6fbec 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
@@ -1372,8 +1372,10 @@ public class VFilterSelect extends Composite implements Paintable, Field,
      */
     private void setSelectedItemIcon(String iconUri) {
         if (iconUri == null || iconUri.length() == 0) {
-            panel.remove(selectedItemIcon);
-            updateRootWidth();
+            if (selectedItemIcon.isAttached()) {
+                panel.remove(selectedItemIcon);
+                updateRootWidth();
+            }
         } else {
             panel.insert(selectedItemIcon, 0);
             selectedItemIcon.setUrl(iconUri);