diff options
| -rw-r--r-- | client/src/main/java/com/vaadin/client/widget/grid/selection/MultiSelectionRenderer.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/client/src/main/java/com/vaadin/client/widget/grid/selection/MultiSelectionRenderer.java b/client/src/main/java/com/vaadin/client/widget/grid/selection/MultiSelectionRenderer.java index 8365083f7e..4462482fb1 100644 --- a/client/src/main/java/com/vaadin/client/widget/grid/selection/MultiSelectionRenderer.java +++ b/client/src/main/java/com/vaadin/client/widget/grid/selection/MultiSelectionRenderer.java @@ -644,7 +644,9 @@ public class MultiSelectionRenderer<T> checkBox.setValue(data, false); // this should be a temp fix. checkBox.setText("Selects row number " + getDOMRowIndex(cell) + "."); - checkBox.setEnabled(grid.isEnabled() && !grid.isEditorActive()); + boolean editorOpen = grid.isEditorActive(); + boolean editorBuffered = grid.isEditorBuffered(); + checkBox.setEnabled(grid.isEnabled() && !(editorOpen && editorBuffered)); } private int getDOMRowIndex(RendererCellReference cell) { |