feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Settings: Do not crash when jumping to filtered out category

Browse Source 
Task-number: QTCREATORBUG-17677
Change-Id: I95633a905d71b981e0bb72ce4af2a2fed605f39d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Eike Ziller
2017-02-13 12:27:57 +01:00
parent cc97609e60
commit 8ed4685b99
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/coreplugin/dialogs/settingsdialog.cpp
View File

@@ -480,10 +480,16 @@ void SettingsDialog::showPage(const Id pageId)
return; // Unknown settings page, probably due to missing plugin.
if (initialCategoryIndex != -1) {
const QModelIndex modelIndex = m_proxyModel->mapFromSource(m_model->index(initialCategoryIndex));
QModelIndex modelIndex = m_proxyModel->mapFromSource(m_model->index(initialCategoryIndex));
if (!modelIndex.isValid()) { // filtered out, so clear filter first
m_filterLineEdit->setText(QString());
modelIndex = m_proxyModel->mapFromSource(m_model->index(initialCategoryIndex));
}
m_categoryList->setCurrentIndex(modelIndex);
if (initialPageIndex != -1)
categories.at(initialCategoryIndex)->tabWidget->setCurrentIndex(initialPageIndex);
if (initialPageIndex != -1) {
if (QTC_GUARD(categories.at(initialCategoryIndex)->tabWidget))
categories.at(initialCategoryIndex)->tabWidget->setCurrentIndex(initialPageIndex);
}
}
}