Merge remote-tracking branch 'origin/6.8'

1 files changed, 3 insertions, 6 deletions

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java b/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java
index 9155f9932a..392c500f1d 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java
@@ -317,16 +317,13 @@ public class VTabsheet extends VTabsheetBase {
         }
 
         public Tab addTab() {
-            // Must check this before insert as insert updates the tab count
-            boolean firstTab = (getTabCount() == 0);
-            
             Tab t = new Tab(this);
+            int tabIndex = getTabCount();
 
             // Logical attach
-            int spacerIndex = getTabCount();
-            insert(t, tr, spacerIndex, true);
+            insert(t, tr, tabIndex, true);
 
-            if (firstTab) {
+            if (tabIndex == 0) {
                 // Set the "first" style
                 t.setStyleNames(false, true);
             }