Does not draw window contents if we're going to another URL. Fixes #2144

svn changeset:5620/svn branch:trunk

1 files changed, 6 insertions, 0 deletions

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IView.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IView.java
index 8e601bd140..5f831124fc 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IView.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IView.java
@@ -149,6 +149,7 @@ public class IView extends SimplePanel implements Container,
         int childIndex = 0;
 
         // Open URL:s
+        boolean isClosed = false; // was this window closed?
         while (childIndex < uidl.getChildCount()
                 && "open".equals(uidl.getChildUIDL(childIndex).getTag())) {
             final UIDL open = uidl.getChildUIDL(childIndex);
@@ -157,6 +158,7 @@ public class IView extends SimplePanel implements Container,
             if (target == null) {
                 // This window is closing. Send close event before
                 // going to the new url
+                isClosed = true;
                 onWindowClosed();
                 goTo(url);
             } else {
@@ -165,6 +167,10 @@ public class IView extends SimplePanel implements Container,
             }
             childIndex++;
         }
+        if (isClosed) {
+            // don't render the content
+            return;
+        }
 
         // Draw this application level window
         UIDL childUidl = uidl.getChildUIDL(childIndex);