From 376174d7aceae6d7e4fc1ddaa73dad773c2f18a9 Mon Sep 17 00:00:00 2001 From: yury Date: Mon, 22 May 2017 15:35:17 +0000 Subject: [PATCH] * pas2jni: Fixed error handling of ppudump. git-svn-id: trunk@36296 - --- utils/pas2jni/ppuparser.pas | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utils/pas2jni/ppuparser.pas b/utils/pas2jni/ppuparser.pas index 749f2c6234..a7d5f14757 100644 --- a/utils/pas2jni/ppuparser.pas +++ b/utils/pas2jni/ppuparser.pas @@ -169,7 +169,8 @@ begin end; end; ec:=ReadProcessOutput(ppudumpprog, '-Fj' + LineEnding + un, s, err); - if Copy(s, 1, 1) <> '[' then begin + err:=Trim(err); + if (Copy(s, 1, 1) <> '[') and ((ec = 0) or (err = '')) then begin ec:=-1; err:='Output of ppudump is not in JSON format.' + LineEnding + 'Probably old version of ppudump has been used.'; end;