From e95ef1c00efb9439686c22ef5e7a83dbdc1dbdd4 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Tue, 8 Jan 2013 01:08:37 +0200
Subject: [PATCH] Cancel possibly pending layout timer when starting layout
 (#10659)

Change-Id: I463379a3c46e7bbd344693b865e142ca5b046d27
---
 client/src/com/vaadin/client/LayoutManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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();
-- 
2.39.5