From b25dfed9ffa7f17192235b76b53442aa0c2a243f Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Thu, 7 Jun 2012 11:35:17 +0300 Subject: [PATCH] Gerrit: Prevent losing portFlag when changing other settings Change-Id: I2ca531b8d9ea9a01739c2f28b7b36e189b0b9b9f Reviewed-by: Friedemann Kleint --- src/plugins/git/gerrit/gerritoptionspage.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/plugins/git/gerrit/gerritoptionspage.cpp b/src/plugins/git/gerrit/gerritoptionspage.cpp index cc4097d1b63..8665fb4e8c3 100644 --- a/src/plugins/git/gerrit/gerritoptionspage.cpp +++ b/src/plugins/git/gerrit/gerritoptionspage.cpp @@ -70,12 +70,13 @@ QWidget *GerritOptionsPage::createPage(QWidget *parent) void GerritOptionsPage::apply() { if (GerritOptionsWidget *w = m_widget.data()) { - const GerritParameters newParameters = w->parameters(); + GerritParameters newParameters = w->parameters(); if (newParameters != *m_parameters) { - bool sshChanged = m_parameters->ssh != newParameters.ssh; + if (m_parameters->ssh == newParameters.ssh) + newParameters.portFlag = m_parameters->portFlag; + else + newParameters.setPortFlagBySshType(); *m_parameters = newParameters; - if (sshChanged) - m_parameters->setPortFlagBySshType(); m_parameters->toSettings(Core::ICore::instance()->settings()); } }