summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/com/itmill/toolkit/terminal/web/ApplicationServlet.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
index 1930547b8f..7129673e0d 100644
--- a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
+++ b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
@@ -1885,6 +1885,10 @@ public class ApplicationServlet extends HttpServlet implements
application.removeListener((Application.WindowAttachListener) this);
application.removeListener((Application.WindowDetachListener) this);
+ // Deregister all window listeners
+ for (Iterator wins = application.getWindows().iterator(); wins.hasNext();)
+ ((Window)wins.next()).removeListener((Paintable.RepaintRequestListener)this);
+
// Manager takes control over the application
mgr.takeControl();
}