diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2013-02-28 13:09:01 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2013-03-01 11:23:42 +0100 |
| commit | 7aed61fa21f8c05fd1d7b32e5e70da3938419fbe (patch) | |
| tree | ff1a26e15529ee14c2d676d0ce2764c13d8f3b18 /src/plugins/vcsbase/command.cpp | |
| parent | 42ca9a127ba3b71547008d79b16ffbaf94e53969 (diff) | |
| download | qt-creator-7aed61fa21f8c05fd1d7b32e5e70da3938419fbe.tar.gz | |
VCS: Allow unlimited timeout
Change-Id: I1544b6ed01e7f7d8aeaaef57c40d1f6afc83a664
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/vcsbase/command.cpp')
| -rw-r--r-- | src/plugins/vcsbase/command.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/vcsbase/command.cpp b/src/plugins/vcsbase/command.cpp index 863ce8fee8..70856bf9b1 100644 --- a/src/plugins/vcsbase/command.cpp +++ b/src/plugins/vcsbase/command.cpp @@ -247,7 +247,8 @@ void Command::run() process->closeWriteChannel(); const int timeOutSeconds = d->m_jobs.at(j).timeout; - if (!Utils::SynchronousProcess::readDataFromProcess(*process, timeOutSeconds * 1000, + if (!Utils::SynchronousProcess::readDataFromProcess(*process, + timeOutSeconds >= 0 ? timeOutSeconds * 1000 : -1, &stdOut, &stdErr, false)) { Utils::SynchronousProcess::stopProcess(*process); ok = false; |