alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

don't crash when removing the currently active tab

Browse Source 
will backport to 4.2

svn path=/trunk/KDE/kdelibs/; revision=916689
This commit is contained in:
Marco Martin 2009-01-25 19:21:14 +00:00
parent 21144164ff
commit d0fb10f0cc
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
widgets/tabbar.cpp
View File

@ -360,18 +360,23 @@ void TabBar::removeTab(int index)
return; return;
} }
int currentIndex = d->tabProxy->native->currentIndex(); int oldCurrentIndex = d->tabProxy->native->currentIndex();
d->tabProxy->native->removeTab(index); d->tabProxy->native->removeTab(index);
QGraphicsWidget *page = d->pages.takeAt(index); QGraphicsWidget *page = d->pages.takeAt(index);
if (index == currentIndex) { int currentIndex = d->tabProxy->native->currentIndex();
setCurrentIndex(currentIndex);
if (oldCurrentIndex == index) {
d->tabWidgetLayout->removeAt(1);
} }
scene()->removeItem(page); scene()->removeItem(page);
page->deleteLater(); page->deleteLater();
if (oldCurrentIndex != currentIndex) {
setCurrentIndex(currentIndex);
}
d->updateTabWidgetMode(); d->updateTabWidgetMode();
d->tabProxy->setPreferredSize(d->tabProxy->native->sizeHint()); d->tabProxy->setPreferredSize(d->tabProxy->native->sizeHint());
} }