[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [falkon] /: WebTab: Fix removing from existing parent in addChildTab
From:       David Rosca <null () kde ! org>
Date:       2018-01-31 20:10:36
Message-ID: E1egyiK-0002Fo-Sp () code ! kde ! org
[Download RAW message or body]

Git commit 4bb75de25cb15970909318d26edc8b2b9c4c489c by David Rosca.
Committed on 31/01/2018 at 20:05.
Pushed by drosca into branch 'master'.

WebTab: Fix removing from existing parent in addChildTab

M  +4    -0    autotests/webtabtest.cpp
M  +1    -2    src/lib/webtab/webtab.cpp

https://commits.kde.org/falkon/4bb75de25cb15970909318d26edc8b2b9c4c489c

diff --git a/autotests/webtabtest.cpp b/autotests/webtabtest.cpp
index da204393..b5a55de7 100644
--- a/autotests/webtabtest.cpp
+++ b/autotests/webtabtest.cpp
@@ -71,6 +71,10 @@ void WebTabTest::parentChildTabsTest()
     QCOMPARE(tab3.childTabs(), QVector<WebTab*>{&tab4});
     QCOMPARE(tab4.parentTab(), &tab3);
 
+    tab3.addChildTab(&tab2);
+    QCOMPARE(tab3.childTabs(), (QVector<WebTab*>{&tab4, &tab2}));
+    QCOMPARE(tab1.childTabs(), (QVector<WebTab*>{&tab3, &tab5, &tab6}));
+
     QTest::qWait(10);
 }
 
diff --git a/src/lib/webtab/webtab.cpp b/src/lib/webtab/webtab.cpp
index 6c9b9aec..d943da16 100644
--- a/src/lib/webtab/webtab.cpp
+++ b/src/lib/webtab/webtab.cpp
@@ -446,9 +446,8 @@ void WebTab::addChildTab(WebTab *tab, int index)
         return;
     }
 
-    tab->m_parentTab = this;
-
     WebTab *tabParent = tab->m_parentTab;
+    tab->m_parentTab = this;
     if (tabParent) {
         const int index = tabParent->m_childTabs.indexOf(tab);
         if (index >= 0) {

[prev in list] [next in list] [prev in thread] [next in thread]