WebTab: Fix removing from existing parent in addChildTab

remotes/origin/Falkon/3.0
David Rosca 8 years ago
parent 1c7288204c
commit 4bb75de25c
No known key found for this signature in database
GPG Key ID: EBC3FC294452C6D8
  1. 4
      autotests/webtabtest.cpp
  2. 3
      src/lib/webtab/webtab.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);
}

@ -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) {

Loading…
Cancel
Save