mawei/dragonpilot
1
0
Fork 0
mirror of https://github.com/dragonpilot/dragonpilot.git synced 2026-02-23 18:23:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cabana: fix possible crash when removing tabs (#26283)

Browse Source 
fix dead loop
This commit is contained in:
Dean Lee
2022-10-30 23:53:02 +08:00
committed by GitHub
parent 9c7e375944
commit 6fed76695c
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tools/cabana/detailwidget.cc
View File

@@ -104,12 +104,7 @@ DetailWidget::DetailWidget(ChartsWidget *charts, QWidget *parent) : charts(chart
setMessage(tabbar->tabText(index));
}
});
QObject::connect(tabbar, &QTabBar::tabCloseRequested, [=](int index) {
if (tabbar->currentIndex() == index) {
tabbar->setCurrentIndex(index == tabbar->count() - 1 ? index - 1 : index + 1);
}
tabbar->removeTab(index);
});
QObject::connect(tabbar, &QTabBar::tabCloseRequested, tabbar, &QTabBar::removeTab);
QObject::connect(charts, &ChartsWidget::chartOpened, [this](const QString &id, const Signal *sig) { updateChartState(id, sig, true); });
QObject::connect(charts, &ChartsWidget::chartClosed, [this](const QString &id, const Signal *sig) { updateChartState(id, sig, false); });
}
@@ -120,9 +115,14 @@ void DetailWidget::showTabBarContextMenu(const QPoint &pt) {
QMenu menu(this);
menu.addAction(tr("Close Other Tabs"));
if (menu.exec(tabbar->mapToGlobal(pt))) {
for (int i = tabbar->count() - 1; i >= 0; --i) {
if (i != index)
tabbar->removeTab(i);
tabbar->setCurrentIndex(index);
// remove all tabs before the one to keep
for (int i = 0; i < index; ++i) {
tabbar->removeTab(0);
}
// remove all tabs after the one to keep
while (tabbar->count() > 1) {
tabbar->removeTab(1);
}
}
}