#733

svn changeset:1515/svn branch:trunk

diff --git a/src/com/itmill/toolkit/ui/Select.java b/src/com/itmill/toolkit/ui/Select.java
index 269ae6f8e9376d00afbb5bf728b021ed92f42561..b986e84e08d7f99109e893b1f329220a51e363ca 100644 (file)
--- a/src/com/itmill/toolkit/ui/Select.java
+++ b/src/com/itmill/toolkit/ui/Select.java
@@ -46,6 +46,7 @@ import java.util.LinkedList;
 import java.util.Map;
 import java.util.Set;
 
+import com.itmill.toolkit.Application;
 import com.itmill.toolkit.data.Container;
 import com.itmill.toolkit.data.Item;
 import com.itmill.toolkit.data.Property;
@@ -1429,8 +1430,9 @@ public class Select extends AbstractField implements Container,
                if (useLazyLoading != isLazyLoading()) {
                        if (useLazyLoading) {
                                optionsStream = new OptionsStream(this);
-                               if (getApplication() != null)
-                                       getWindow().addURIHandler(optionsStream);
+                               Application app = getApplication();
+                               if (app != null)
+                                       app.getMainWindow().addURIHandler(optionsStream);
                        } else {
                                if (getApplication() != null)
                                        getWindow().removeURIHandler(optionsStream);
@@ -1449,7 +1451,7 @@ public class Select extends AbstractField implements Container,
        public void attach() {
                super.attach();
                if (optionsStream != null)
-                       getWindow().addURIHandler(optionsStream);
+                       getApplication().getMainWindow().addURIHandler(optionsStream);
        }
 
        /**