summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2013-01-08 01:08:37 +0200
committerArtur Signell <artur@vaadin.com>2013-01-08 01:10:41 +0200
commite95ef1c00efb9439686c22ef5e7a83dbdc1dbdd4 (patch)
treedbdd58e114ece49c23bf6217d706b50b37e3f173
parent68406d87bb4dfb90d460ac02ef6412493f76eba7 (diff)
downloadvaadin-framework-e95ef1c00efb9439686c22ef5e7a83dbdc1dbdd4.tar.gz
vaadin-framework-e95ef1c00efb9439686c22ef5e7a83dbdc1dbdd4.zip
Cancel possibly pending layout timer when starting layout (#10659)
Change-Id: I463379a3c46e7bbd344693b865e142ca5b046d27
-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();