From cb5500f9a839f1f8c235d4581b663303da3f26f6 Mon Sep 17 00:00:00 2001
From: Teemu Suo-Anttila <teemusa@vaadin.com>
Date: Tue, 16 Feb 2016 08:33:59 +0200
Subject: Fix Editor trying to detach save and cancel buttons when unbuffered

This is a fix to an regression in some grid patch.

Change-Id: Ibd35d7a06f0e0b15e854bf036ccfb7f462e2d37f
---
 client/src/com/vaadin/client/widgets/Grid.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'client')

diff --git a/client/src/com/vaadin/client/widgets/Grid.java b/client/src/com/vaadin/client/widgets/Grid.java
index 252bcfed3c..c6c661cab2 100644
--- a/client/src/com/vaadin/client/widgets/Grid.java
+++ b/client/src/com/vaadin/client/widgets/Grid.java
@@ -2015,8 +2015,10 @@ public class Grid<T> extends ResizeComposite implements
             }
             columnToWidget.clear();
 
-            grid.detachWidget(saveButton);
-            grid.detachWidget(cancelButton);
+            if (isBuffered()) {
+                grid.detachWidget(saveButton);
+                grid.detachWidget(cancelButton);
+            }
 
             editorOverlay.removeAllChildren();
             cellWrapper.removeAllChildren();
-- 
cgit v1.2.3