206232 Using the same Control for all Tab don't show the first selection

1 files changed, 10 insertions, 4 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabItem.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabItem.java
index 4742154af6..b09c0b7499 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabItem.java
@@ -262,10 +262,16 @@ public void setControl (Control control) {
 	}
 	Control oldControl = this.control, newControl = control;
 	this.control = control;
-	int index = parent.indexOf (this);
-	if (index != parent.getSelectionIndex ()) {
-		if (newControl != null) newControl.setVisible (false);
-		return;
+	int index = parent.indexOf (this), selectionIndex = parent.getSelectionIndex();
+	if (index != selectionIndex) {
+		if (newControl != null) {
+			if (selectionIndex != -1) {
+				Control selectedControl = parent.getItem(selectionIndex).getControl();
+				if (selectedControl == newControl) return;
+			}
+			newControl.setVisible(false);
+			return;
+		}
 	}
 	if (newControl != null) {
 		newControl.setBounds (parent.getClientArea ());