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

SettingsDialog: Unknown settings pages aren't a fatal condition.

Browse Source 
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 <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2015-03-23 11:03:37 +01:00
committed by hjk
parent 11f6cc7c3f
commit 9301138540
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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));