From 534ea587d5c7bd238d3754da6d1711716a1ed617 Mon Sep 17 00:00:00 2001
From: Henrik Paul <henrik@vaadin.com>
Date: Wed, 15 Jan 2014 17:16:44 +0200
Subject: [PATCH] Fixes two 'rolling index' bugs when removing columns

Change-Id: I0b278121bf46c3c05c05f73c2aa71f7bfc70cf3a
---
 client/src/com/vaadin/client/ui/grid/Escalator.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/src/com/vaadin/client/ui/grid/Escalator.java b/client/src/com/vaadin/client/ui/grid/Escalator.java
index f306166a74..887db8a758 100644
--- a/client/src/com/vaadin/client/ui/grid/Escalator.java
+++ b/client/src/com/vaadin/client/ui/grid/Escalator.java
@@ -2761,10 +2761,9 @@ public class Escalator extends Widget {
                 }
             }
 
-            flyweightRow.removeCells(index, numberOfColumns);
             List<Column> removedColumns = new ArrayList<Column>();
             for (int i = 0; i < numberOfColumns; i++) {
-                removedColumns.add(columns.remove(i));
+                removedColumns.add(columns.remove(index));
             }
 
             if (hasSomethingInDom()) {
-- 
2.39.5