From 5d84f67e4684f8a1b7d955c73f2b957fce815c32 Mon Sep 17 00:00:00 2001
From: Basile Burg <basile.b@gmx.com>
Date: Fri, 4 Nov 2016 15:30:53 +0100
Subject: [PATCH] allow to check StdErr content at debug time

---
 src/ce_common.pas | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/ce_common.pas b/src/ce_common.pas
index 8ab7a199..6ccc0512 100644
--- a/src/ce_common.pas
+++ b/src/ce_common.pas
@@ -1324,14 +1324,17 @@ begin
 end;
 
 procedure tryRaiseFromStdErr(proc: TProcess);
+var
+  str: string;
 begin
-  if (proc.ExitStatus <> 0) and (poUsePipes in proc.Options) then
-    with TStringList.Create do
+  if (proc.ExitStatus <> 0) and (poUsePipes in proc.Options) and not
+    (poStderrToOutPut in proc.Options) then with TStringList.Create do
   try
     LoadFromStream(proc.Stderr);
-    Insert(0, format('tool crashed with code: %d (%s)',
-      [proc.ExitStatus, shortenPath(proc.Executable)]));
-    raise Exception.Create(Text);
+    Insert(0, format('%s crashed with code: %d',
+      [shortenPath(proc.Executable), proc.ExitStatus]));
+    str := Text;
+    raise Exception.Create(str);
   finally
     free;
   end;
@@ -1344,7 +1347,7 @@ begin
   for i := strings.Count-1 downto 0 do
   begin
     j := strings.IndexOf(strings[i]);
-    if (j <> -1) and (j <> i) then
+    if (j <> -1) and (j < i) then
       strings.Delete(i);
   end;
 end;