From f3f5a16f27490737bcd6efe62a3a1615cfacfc28 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Thu, 23 Feb 2017 12:52:00 +0200 Subject: [PATCH] Gerrit: Fix initial refresh when the fallback host matches the remote. Change-Id: I2c630739db4b698acdcf51f6b663070cfd5ecc4d Reviewed-by: Tobias Hunger --- src/plugins/git/gerrit/gerritdialog.cpp | 6 ++++-- src/plugins/git/gerrit/gerritmodel.h | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/plugins/git/gerrit/gerritdialog.cpp b/src/plugins/git/gerrit/gerritdialog.cpp index 43f71b50c4a..41cd427efec 100644 --- a/src/plugins/git/gerrit/gerritdialog.cpp +++ b/src/plugins/git/gerrit/gerritdialog.cpp @@ -218,8 +218,10 @@ void GerritDialog::remoteChanged() if (m_updatingRemotes || m_ui->remoteComboBox->count() == 0) return; const GerritServer server = m_ui->remoteComboBox->currentData().value(); - if (m_server->host == server.host) - return; + if (QSharedPointer modelServer = m_model->server()) { + if (*modelServer == server) + return; + } *m_server = server; slotRefresh(); } diff --git a/src/plugins/git/gerrit/gerritmodel.h b/src/plugins/git/gerrit/gerritmodel.h index d106a6b1313..15582776152 100644 --- a/src/plugins/git/gerrit/gerritmodel.h +++ b/src/plugins/git/gerrit/gerritmodel.h @@ -118,6 +118,7 @@ public: QString toHtml(const QModelIndex &index) const; QStandardItem *itemForNumber(int number) const; + QSharedPointer server() const { return m_server; } enum QueryState { Idle, Running, Ok, Error }; QueryState state() const { return m_state; }