summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
Diffstat (limited to 'client')
-rw-r--r--client/src/com/vaadin/client/widgets/Grid.java6
1 files changed, 4 insertions, 2 deletions
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();