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

Gerrit: Prevent losing portFlag when changing other settings

Browse Source 
Change-Id: I2ca531b8d9ea9a01739c2f28b7b36e189b0b9b9f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Orgad Shaneh
2012-06-07 11:35:17 +03:00
committed by Friedemann Kleint
parent d10b52741a
commit b25dfed9ff
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/git/gerrit/gerritoptionspage.cpp
View File

@@ -70,12 +70,13 @@ QWidget *GerritOptionsPage::createPage(QWidget *parent)
void GerritOptionsPage::apply() void GerritOptionsPage::apply()
{ {
if (GerritOptionsWidget *w = m_widget.data()) { if (GerritOptionsWidget *w = m_widget.data()) {
const GerritParameters newParameters = w->parameters(); GerritParameters newParameters = w->parameters();
if (newParameters != *m_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; *m_parameters = newParameters;
if (sshChanged)
m_parameters->setPortFlagBySshType();
m_parameters->toSettings(Core::ICore::instance()->settings()); m_parameters->toSettings(Core::ICore::instance()->settings());
} }
} }