diff options
author | Robert Loehning <robert.loehning@qt.io> | 2017-03-06 18:04:49 +0100 |
---|---|---|
committer | Robert Loehning <robert.loehning@qt.io> | 2017-03-09 17:37:11 +0000 |
commit | f4c0c780020beee0566cced9065e08e18680e3bc (patch) | |
tree | e0d28936336573a31932f94d5e7676109ed07498 /src/plugins/vcsbase/vcsbaseeditorconfig.cpp | |
parent | 0e4b2336855b063378608ea050818cf9c0ec3937 (diff) |
Revert "VCSBaseEditorParameterWidget::mapSetting cope with 0 pointer"
This reverts commit b5ce5e9086941e5ed21bef47c8aace248bf1d83c
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>
Diffstat (limited to 'src/plugins/vcsbase/vcsbaseeditorconfig.cpp')
-rw-r--r-- | src/plugins/vcsbase/vcsbaseeditorconfig.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/vcsbase/vcsbaseeditorconfig.cpp b/src/plugins/vcsbase/vcsbaseeditorconfig.cpp index 8ef9f506f6..80e9d9bb08 100644 --- a/src/plugins/vcsbase/vcsbaseeditorconfig.cpp +++ b/src/plugins/vcsbase/vcsbaseeditorconfig.cpp @@ -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); |