Cancel possibly pending layout timer when starting layout (#10659)

Change-Id: I463379a3c46e7bbd344693b865e142ca5b046d27

diff --git a/client/src/com/vaadin/client/LayoutManager.java b/client/src/com/vaadin/client/LayoutManager.java
index d7a27ea8a4f1d440c7b6f3a50a70bfc709dd1027..8aa43f855f57e8fef7ad57a178a75eaabaae3857 100644 (file)
--- 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();