merged [9511] from 6.1

svn changeset:9512/svn branch:6.2

diff --git a/src/com/vaadin/ui/Window.java b/src/com/vaadin/ui/Window.java
index dc1bf7e18fe094fcb3b84b47c32c01abe6ceca8a..a91bd4026bd1ba2353a07d707de3abcfdf00846f 100644 (file)
--- a/src/com/vaadin/ui/Window.java
+++ b/src/com/vaadin/ui/Window.java
@@ -381,7 +381,7 @@ public class Window extends Panel implements URIHandler, ParameterHandler {
         if (getParent() != null) {
             // this is subwindow
             Window mainWindow = (Window) getParent();
-            mainWindow.addParameterHandler(handler);
+            mainWindow.removeParameterHandler(handler);
         } else {
             if (handler == null || parameterHandlerList == null) {
                 return;