From 49644f7f4298d5bd2038227bd5db4401e2f881a6 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Tue, 8 Aug 2017 19:31:09 +0000
Subject: Fix [4966cad4d4]: Wrong tab shown in ttk::notebook. Patch from Gregor
 Cramer. Cherrypicked [e033e444].

---
 generic/ttk/ttkNotebook.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/generic/ttk/ttkNotebook.c b/generic/ttk/ttkNotebook.c
index 83d7db9..56439a6 100644
--- a/generic/ttk/ttkNotebook.c
+++ b/generic/ttk/ttkNotebook.c
@@ -627,9 +627,12 @@ static void SelectTab(Notebook *nb, int index)
 	Ttk_UnmapSlave(nb->notebook.mgr, currentIndex);
     }
 
-    NotebookPlaceSlave(nb, index);
-
+    /* Must be set before calling NotebookPlaceSlave(), otherwise it may
+     * happen that NotebookPlaceSlaves(), triggered by an interveaning
+     * geometry request, will swap to old index. */
     nb->notebook.currentIndex = index;
+
+    NotebookPlaceSlave(nb, index);
     TtkRedisplayWidget(&nb->core);
 
     TtkSendVirtualEvent(nb->core.tkwin, "NotebookTabChanged");
-- 
cgit v0.12