diff options
Diffstat (limited to 'client')
| -rw-r--r-- | client/src/main/java/com/vaadin/client/connectors/grid/EditorConnector.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/client/src/main/java/com/vaadin/client/connectors/grid/EditorConnector.java b/client/src/main/java/com/vaadin/client/connectors/grid/EditorConnector.java index 31803c235c..76a79693ca 100644 --- a/client/src/main/java/com/vaadin/client/connectors/grid/EditorConnector.java +++ b/client/src/main/java/com/vaadin/client/connectors/grid/EditorConnector.java @@ -72,8 +72,11 @@ public class EditorConnector extends AbstractExtensionConnector { @Override public void cancel() { - serverInitiated = true; - getParent().getWidget().cancelEditor(); + // Canceling an editor that is not open is a no-op. + if (getParent().getWidget().isEditorActive()) { + serverInitiated = true; + getParent().getWidget().cancelEditor(); + } } @Override |