diff options
| author | dt <[email protected]> | 2009-04-07 12:04:43 +0200 |
|---|---|---|
| committer | dt <[email protected]> | 2009-04-07 12:04:43 +0200 |
| commit | 3da6ca098c66be93067bae560706b35b142295ef (patch) | |
| tree | cf79ec61a29b820fb686b8710d86bc39638d99db /src/plugins/git/gitclient.cpp | |
| parent | c95f079fc0aa53aab0ffea9ec093187490747ecf (diff) | |
Kill the git process if we timed out waiting for it.
Diffstat (limited to 'src/plugins/git/gitclient.cpp')
| -rw-r--r-- | src/plugins/git/gitclient.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index c7558f1a18f..d563b95d8fe 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -544,9 +544,11 @@ bool GitClient::synchronousGit(const QString &workingDirectory, process.setEnvironment(environment.toStringList()); process.start(m_binaryPath, arguments); + if (!process.waitForFinished()) { if (errorText) *errorText = "Error: Git timed out"; + process.kill(); return false; } |