diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2017-05-14 11:27:54 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2017-05-15 08:19:59 +0000 |
| commit | 7e8bac1512b14275ad30478e0da82122a885ecd1 (patch) | |
| tree | 5dca98c527a2bfa29a452eeeba949ad7a5921699 /src/plugins/git/gerrit/gerritmodel.cpp | |
| parent | 4b38b09a81555a183bcc44bfb7fa3dda8e702865 (diff) | |
| download | qt-creator-7e8bac1512b14275ad30478e0da82122a885ecd1.tar.gz | |
Gerrit: Terminate previous query when remote is changed
Change-Id: Ifafaa9068dca069562973151361e653f6db3617e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/plugins/git/gerrit/gerritmodel.cpp')
| -rw-r--r-- | src/plugins/git/gerrit/gerritmodel.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
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<GerritServer> &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; |