From c969fe30440638e614aabe06593b930f4cf23ea2 Mon Sep 17 00:00:00 2001 From: Basile Burg Date: Mon, 1 Dec 2014 05:38:04 +0100 Subject: [PATCH] Revert "Revert "hidden some variables"" This reverts commit 9112cc91e4018ca9f33a6f8611215139e19b6b15. --- src/ce_dcd.pas | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/ce_dcd.pas b/src/ce_dcd.pas index f4866609..98bb57a3 100644 --- a/src/ce_dcd.pas +++ b/src/ce_dcd.pas @@ -39,13 +39,15 @@ procedure getHint(const aFilename: string; aPosition: Integer; const list: TStri *) procedure getSymbolLoc(var aFilename: string; var aPosition: Integer); +var + dcdOn: boolean = true; + +implementation + var DCD_server: TProcess = nil; DCD_client: TProcess = nil; lines: TStringList; - dcdOn: boolean; - -implementation procedure lazyServerStart; begin @@ -148,13 +150,12 @@ begin if not dcdOn then exit; lazyServerStart; - if DCD_client.Running then - exit; + if DCD_client.Running then DCD_client.Terminate(0); // DCD_client.Parameters.Clear; + DCD_client.Parameters.Add('-d'); DCD_client.Parameters.Add('-c'); DCD_client.Parameters.Add(intToStr(aPosition)); - DCD_client.Parameters.Add('-d'); DCD_client.Parameters.Add(aFilename); DCD_client.Execute; // @@ -205,8 +206,10 @@ initialization createServer; DCD_client := TProcess.Create(nil); DCD_client.Executable := 'dcd-client' + exeExt; - DCD_client.Options := [poUsePipes{$IFDEF WINDOWS}, poNewConsole{$ENDIF}]; + DCD_client.Options := [poUsePipes, poStderrToOutPut {$IFDEF WINDOWS}, poNewConsole{$ENDIF}]; + {$IFNDEF DEBUG} DCD_client.ShowWindow := swoHIDE; + {$ENDIF} dcdOn := exeInSysPath(DCD_server.Executable) and exeInSysPath(DCD_client.Executable); lines := TStringList.Create; finalization