From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Mon, 15 Mar 2010 08:37:58 +0000 (+0000)
Subject: #4333
X-Git-Tag: 6.7.0.beta1~1930
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e079f33b1e1df4ec81ec26f5207766cdb928656e;p=vaadin-framework.git

#4333

svn changeset:11858/svn branch:6.3
---

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
index a1c909c7ef..fb95cc86d3 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
@@ -1678,7 +1678,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 {