fix #156 - Debugee option "workingDirectory" does not expand the symstrings

This commit is contained in:
Basile Burg 2017-06-07 14:39:10 +02:00
parent 0c39fe224e
commit b37d4ad352
No known key found for this signature in database
GPG Key ID: 1868039F415CB8CF
1 changed files with 10 additions and 13 deletions

View File

@ -1757,7 +1757,7 @@ begin
str := fSyms.expand(str[1..str.length-1]); str := fSyms.expand(str[1..str.length-1]);
gdbCommand('-environment-path ' + str); gdbCommand('-environment-path ' + str);
end; end;
if DirectoryExists(o.workingDirectory) then if DirectoryExists(fSyms.expand(o.workingDirectory)) then
gdbCommand('-environment-cd ' + fSyms.expand(o.workingDirectory)); gdbCommand('-environment-cd ' + fSyms.expand(o.workingDirectory));
if (o.arguments.Count <> 0) or (o.queryArguments) then if (o.arguments.Count <> 0) or (o.queryArguments) then
begin begin
@ -1785,22 +1785,19 @@ begin
dbgeeOptsEd.TIObject := nil; dbgeeOptsEd.TIObject := nil;
if not fDbgRunnable then if not fDbgRunnable then
begin begin
if fProj = nil then if fProj <> nil then
exit nme := fProj.filename;
else nme := fProj.filename;
if not nme.fileExists then
exit;
end end
else else
begin begin
if fDoc = nil then if fDoc.isNotNil then
exit nme := fDoc.filename;
else nme := fDoc.filename; end;
if not nme.fileExists then if nme.fileExists then
exit; begin
opt := fDebugeeOptions.projectByFile[nme];
dbgeeOptsEd.TIObject := opt;
end; end;
opt := fDebugeeOptions.projectByFile[nme];
dbgeeOptsEd.TIObject := opt;
end; end;
procedure TCEGdbWidget.synchronizeBreakpointsFromDoc; procedure TCEGdbWidget.synchronizeBreakpointsFromDoc;