From 93011385404314fb4a8402660743ba445e91e031 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Mon, 23 Mar 2015 11:03:37 +0100 Subject: [PATCH] SettingsDialog: Unknown settings pages aren't a fatal condition. Whenever you remove a plugin with a settings page you will eventually run into this. We can silently ignore it. Change-Id: I887d7e7d21e1e2f68375b60456160f9998f9c650 Reviewed-by: Friedemann Kleint Reviewed-by: Eike Ziller --- src/plugins/coreplugin/dialogs/settingsdialog.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/coreplugin/dialogs/settingsdialog.cpp b/src/plugins/coreplugin/dialogs/settingsdialog.cpp index cd3483776aa..fefce66e3b7 100644 --- a/src/plugins/coreplugin/dialogs/settingsdialog.cpp +++ b/src/plugins/coreplugin/dialogs/settingsdialog.cpp @@ -397,8 +397,8 @@ void SettingsDialog::showPage(const Id pageId) } } - QTC_ASSERT(!initialPageId.isValid() || initialPageIndex != -1, - qDebug("Unknown page: %s", initialPageId.name().constData())); + if (initialPageId.isValid() && initialPageIndex == -1) + return; // Unknown settings page, probably due to missing plugin. if (initialCategoryIndex != -1) { const QModelIndex modelIndex = m_proxyModel->mapFromSource(m_model->index(initialCategoryIndex));