fix #228 - possible infinite loop when compiling a runnable with auto solved dependencies

This commit is contained in:
Basile Burg 2018-01-31 13:44:26 +01:00
parent c692177483
commit b3c2efe817
1 changed files with 14 additions and 8 deletions

View File

@ -601,17 +601,23 @@ begin
// add the library files and the import paths for the selection // add the library files and the import paths for the selection
if not sel.IsEmpty then with sel.Iterator do if not sel.IsEmpty then with sel.Iterator do
begin begin
while true do if data.hasValidLibFile then while true do
begin begin
if not data.enabled then itm := Data;
fMsgs.message(format(deactivatedMessage, [data.libAlias]), if itm.isNil then
nil, amcAutoCompile, amkWarn) break;
else if itm.hasValidLibFile then
begin begin
libs.Add(Data.libFile); if not itm.enabled then
paths.Add('-I' + Data.libSourcePath); fMsgs.message(format(deactivatedMessage, [itm.libAlias]),
nil, amcAutoCompile, amkWarn)
else
begin
libs.Add(itm.libFile);
paths.Add('-I' + itm.libSourcePath);
end;
end; end;
if not Next then if not next then
break; break;
end; end;
free; free;