Settings: Do not crash when jumping to filtered out category

Task-number: QTCREATORBUG-17677
Change-Id: I95633a905d71b981e0bb72ce4af2a2fed605f39d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>

1 files changed, 9 insertions, 3 deletions

diff --git a/src/plugins/coreplugin/dialogs/settingsdialog.cpp b/src/plugins/coreplugin/dialogs/settingsdialog.cpp
index 05912c0087..2322a2486d 100644
--- a/src/plugins/coreplugin/dialogs/settingsdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/settingsdialog.cpp
@@ -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);
+        }
     }
 }