From f6e3039d313aaab8c16725acea12b9ec429ba6f2 Mon Sep 17 00:00:00 2001
From: John Ahlroos <john@vaadin.com>
Date: Tue, 19 Feb 2013 16:07:46 +0200
Subject: Revert merge from 6.8 fixing #8238 since it was causing issues like
 #11026. Should be fixed in another way. (no-merge)

Change-Id: I232f55781daf7ab5137f9602d3a3c6c2020c6064
---
 .../src/com/vaadin/client/ui/tabsheet/TabsheetBaseConnector.java  | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'client')

diff --git a/client/src/com/vaadin/client/ui/tabsheet/TabsheetBaseConnector.java b/client/src/com/vaadin/client/ui/tabsheet/TabsheetBaseConnector.java
index 9944ec5308..283bc1b63b 100644
--- a/client/src/com/vaadin/client/ui/tabsheet/TabsheetBaseConnector.java
+++ b/client/src/com/vaadin/client/ui/tabsheet/TabsheetBaseConnector.java
@@ -89,6 +89,14 @@ public abstract class TabsheetBaseConnector extends
             }
         }
 
+        // Detach any old tab widget, should be max 1
+        for (Iterator<Widget> iterator = oldWidgets.iterator(); iterator
+                .hasNext();) {
+            Widget oldWidget = iterator.next();
+            if (oldWidget.isAttached()) {
+                oldWidget.removeFromParent();
+            }
+        }
     }
 
     @Override
-- 
cgit v1.2.3