forks
/
dexed
mirror of https://gitlab.com/basile.b/dexed.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix #41, D&D broken in 2a1

This commit is contained in:
Basile Burg 2015-09-27 00:03:22 +02:00
parent 54b13358de
commit 7d0b295a76
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/ce_dubproject.pas
View File

@ -182,10 +182,15 @@ begin
else
loader.Position:= 0;
//
fJSON.Free;
FreeAndNil(fJSON);
parser := TJSONParser.Create(loader);
try
fJSON := parser.Parse as TJSONObject;
try
fJSON := parser.Parse as TJSONObject;
except
if assigned(fJSON) then
FreeAndNil(fJSON);
end;
finally
parser.Free;
end;
@ -426,6 +431,8 @@ procedure TCEDubProject.updatePackageNameFromJson;
var
value: TJSONData;
begin
if not assigned(fJSON) then
exit;
value := fJSON.Find('name');
if not assigned(value) then fPackageName := ''
else fPackageName := value.AsString;
@ -440,6 +447,8 @@ var
begin
fBuildTypes.Clear;
fConfigs.Clear;
if not assigned(fJSON) then
exit;
// the CE interface for dub doesn't make the difference between build type
//and config, instead each possible combination type + build is generated.
if fJSON.Find('configurations') <> nil then
@ -514,6 +523,8 @@ var
pth: string;
begin
fSrcs.Clear;
if not assigned(fJSON) then
exit;
lst := TStringList.Create;
try
// auto folders & files
@ -685,6 +696,7 @@ var
end;
begin
fOutputFileName := '';
if not assigned(fJSON) then exit;
item := fJSON.Find('name');
if not assigned(item) then
exit;