From: Artur Signell <artur@vaadin.com>
Date: Mon, 7 Jan 2013 23:08:37 +0000 (+0200)
Subject: Cancel possibly pending layout timer when starting layout (#10659)
X-Git-Tag: 7.0.0.rc1~70^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fchanges%2F87%2F587%2F2;p=vaadin-framework.git

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