diff options
| author | yury <yury@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2015-10-17 20:39:08 +0000 |
|---|---|---|
| committer | yury <yury@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2015-10-17 20:39:08 +0000 |
| commit | 01d51f25a5a0aa4e68258f68f4299a90d13ab872 (patch) | |
| tree | 2f832fcff521e2c689a449221cb64ed7cf8410b2 /utils | |
| parent | 3b37c4c5fa749de475d243829207f9d03327a6b5 (diff) | |
| download | fpc-01d51f25a5a0aa4e68258f68f4299a90d13ab872.tar.gz | |
Merged revision(s) 32083 from trunk:
* pas2jni: Fixed reading of the ppudump's output in some cases.
........
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@32085 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/pas2jni/ppuparser.pas | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/utils/pas2jni/ppuparser.pas b/utils/pas2jni/ppuparser.pas index a8922d63f7..9d1d5364f0 100644 --- a/utils/pas2jni/ppuparser.pas +++ b/utils/pas2jni/ppuparser.pas @@ -219,7 +219,7 @@ begin repeat _ReadOutput(p.Output, s); _ReadOutput(p.Stderr, err); - until not p.Running; + until not p.Running and (p.Output.NumBytesAvailable = 0) and (p.Stderr.NumBytesAvailable = 0); ec:=p.ExitStatus; if Copy(s, 1, 1) <> '[' then begin ec:=-1; |