From b5ce5e9086941e5ed21bef47c8aace248bf1d83c Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@nokia.com>
Date: Thu, 6 Oct 2011 13:13:01 +0200
Subject: [PATCH] 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>
---
src/plugins/vcsbase/vcsbaseeditorparameterwidget.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/plugins/vcsbase/vcsbaseeditorparameterwidget.cpp b/src/plugins/vcsbase/vcsbaseeditorparameterwidget.cpp
index a15e32fa761..2d8288ae0ee 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);
--
GitLab