diff options
| author | Matti Tahvonen <matti.tahvonen@itmill.com> | 2010-03-15 08:41:26 +0000 |
|---|---|---|
| committer | Matti Tahvonen <matti.tahvonen@itmill.com> | 2010-03-15 08:41:26 +0000 |
| commit | a64293b86451a4b62c02e98dea22f9175043c0b3 (patch) | |
| tree | 21924f85a5f0e2f0e00bec701009cc372afa1625 | |
| parent | 8caa77c193ae4faf2051d09dc9e1ba2a9ca623b0 (diff) | |
| download | vaadin-framework-a64293b86451a4b62c02e98dea22f9175043c0b3.tar.gz vaadin-framework-a64293b86451a4b62c02e98dea22f9175043c0b3.zip | |
merged [11858] from 6.3
svn changeset:11861/svn branch:6.2
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java index 465f4b38ae..4dde2b69cd 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java @@ -1649,7 +1649,9 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler { @Override protected void onDetach() { super.onDetach(); - client.getContextMenu().ensureHidden(this); + if (client != null) { + client.getContextMenu().ensureHidden(this); + } } class VisibleColumnAction extends Action { |