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

Revert "VCSBaseEditorParameterWidget::mapSetting cope with 0 pointer"

Browse Source 
This reverts commit b5ce5e9086
because the check already happened two lines before.

Change-Id: Ic230fe767c22dc4747a4ceecedd68fc09c99267b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Robert Loehning
2017-03-06 18:04:49 +01:00
parent 0e4b233685
commit f4c0c78002
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/vcsbase/vcsbaseeditorconfig.cpp
View File

@@ -194,7 +194,7 @@ void VcsBaseEditorConfig::mapSetting(QComboBox *comboBox, QString *setting)
d->m_settingMapping.insert(comboBox, Internal::SettingMappingData(setting));
if (setting) {
comboBox->blockSignals(true);
const int itemIndex = setting ? comboBox->findData(*setting) : -1;
const int itemIndex = comboBox->findData(*setting);
if (itemIndex != -1)
comboBox->setCurrentIndex(itemIndex);
comboBox->blockSignals(false);