From 7e8bac1512b14275ad30478e0da82122a885ecd1 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Sun, 14 May 2017 11:27:54 +0300 Subject: Gerrit: Terminate previous query when remote is changed Change-Id: Ifafaa9068dca069562973151361e653f6db3617e Reviewed-by: Friedemann Kleint Reviewed-by: Tobias Hunger --- src/plugins/git/gerrit/gerritmodel.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/plugins/git/gerrit/gerritmodel.cpp') diff --git a/src/plugins/git/gerrit/gerritmodel.cpp b/src/plugins/git/gerrit/gerritmodel.cpp index 08196d8136..bb33916a5e 100644 --- a/src/plugins/git/gerrit/gerritmodel.cpp +++ b/src/plugins/git/gerrit/gerritmodel.cpp @@ -230,6 +230,7 @@ public: ~QueryContext(); void start(); + void terminate(); signals: void resultRetrieved(const QByteArray &); @@ -242,7 +243,6 @@ private: void timeout(); void errorTermination(const QString &msg); - void terminate(); QProcess m_process; QTimer m_timer; @@ -498,10 +498,8 @@ QStandardItem *GerritModel::itemForNumber(int number) const void GerritModel::refresh(const QSharedPointer &server, const QString &query) { - if (m_query) { - qWarning("%s: Another query is still running", Q_FUNC_INFO); - return; - } + if (m_query) + m_query->terminate(); clearData(); m_server = server; -- cgit v1.2.1