summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
Diffstat (limited to 'client')
-rw-r--r--client/src/com/vaadin/client/LayoutManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/client/src/com/vaadin/client/LayoutManager.java b/client/src/com/vaadin/client/LayoutManager.java
index d7a27ea8a4..8aa43f855f 100644
--- a/client/src/com/vaadin/client/LayoutManager.java
+++ b/client/src/com/vaadin/client/LayoutManager.java
@@ -61,7 +61,6 @@ public class LayoutManager {
private Timer layoutTimer = new Timer() {
@Override
public void run() {
- cancel();
layoutNow();
}
};
@@ -228,6 +227,7 @@ public class LayoutManager {
"Can't start a new layout phase before the previous layout phase ends.");
}
layoutPending = false;
+ layoutTimer.cancel();
try {
currentDependencyTree = new LayoutDependencyTree();
doLayout();