diff options
author | Daniel Teske <daniel.teske@nokia.com> | 2011-10-06 13:13:01 +0200 |
---|---|---|
committer | Daniel Teske <daniel.teske@nokia.com> | 2011-10-07 14:09:16 +0200 |
commit | b5ce5e9086941e5ed21bef47c8aace248bf1d83c (patch) | |
tree | d6fad07925a424bb94d2dd394f43f2f8d26a27f8 /src/plugins/vcsbase/vcsbaseeditorparameterwidget.cpp | |
parent | d8ac419ef5a814f85cc8f5251d1522faaa54212e (diff) | |
download | qt-creator-b5ce5e9086941e5ed21bef47c8aace248bf1d83c.tar.gz |
VCSBaseEditorParameterWidget::mapSetting cope with 0 pointer
Change-Id: I797488c6ace58a6f927fe3d528131682f1832de1
Reviewed-on: http://codereview.qt-project.org/6235
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Diffstat (limited to 'src/plugins/vcsbase/vcsbaseeditorparameterwidget.cpp')
-rw-r--r-- | src/plugins/vcsbase/vcsbaseeditorparameterwidget.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/vcsbase/vcsbaseeditorparameterwidget.cpp b/src/plugins/vcsbase/vcsbaseeditorparameterwidget.cpp index a15e32fa76..2d8288ae0e 100644 --- a/src/plugins/vcsbase/vcsbaseeditorparameterwidget.cpp +++ b/src/plugins/vcsbase/vcsbaseeditorparameterwidget.cpp @@ -195,7 +195,7 @@ void VCSBaseEditorParameterWidget::mapSetting(QComboBox *comboBox, QString *sett d->m_settingMapping.insert(comboBox, Internal::SettingMappingData(setting)); if (setting) { comboBox->blockSignals(true); - const int itemIndex = comboBox->findData(*setting); + const int itemIndex = setting ? comboBox->findData(*setting) : -1; if (itemIndex != -1) comboBox->setCurrentIndex(itemIndex); comboBox->blockSignals(false); |