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

Gerrit: Fix initial refresh

Browse Source 
when the fallback host matches the remote.

Change-Id: I2c630739db4b698acdcf51f6b663070cfd5ecc4d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Orgad Shaneh
2017-02-23 12:52:00 +02:00
committed by Orgad Shaneh
parent da3f9379c1
commit f3f5a16f27
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/git/gerrit/gerritdialog.cpp
View File

@@ -218,8 +218,10 @@ void GerritDialog::remoteChanged()
if (m_updatingRemotes || m_ui->remoteComboBox->count() == 0) if (m_updatingRemotes || m_ui->remoteComboBox->count() == 0)
return; return;
const GerritServer server = m_ui->remoteComboBox->currentData().value<GerritServer>(); const GerritServer server = m_ui->remoteComboBox->currentData().value<GerritServer>();
if (m_server->host == server.host) if (QSharedPointer<GerritServer> modelServer = m_model->server()) {
if (*modelServer == server)
return; return;
}
*m_server = server; *m_server = server;
slotRefresh(); slotRefresh();
} }

1
src/plugins/git/gerrit/gerritmodel.h
View File

@@ -118,6 +118,7 @@ public:
QString toHtml(const QModelIndex &index) const; QString toHtml(const QModelIndex &index) const;
QStandardItem *itemForNumber(int number) const; QStandardItem *itemForNumber(int number) const;
QSharedPointer<GerritServer> server() const { return m_server; }
enum QueryState { Idle, Running, Ok, Error }; enum QueryState { Idle, Running, Ok, Error };
QueryState state() const { return m_state; } QueryState state() const { return m_state; }