paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-07 10:40:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged revision(s) 59110 #fd64c39c73 from trunk:

Browse Source 
Opkman: Fix memory leak.
........

git-svn-id: branches/fixes_2_0@59120 -
This commit is contained in:
maxim 2018-09-21 22:25:04 +00:00
parent 14c57a58c6
commit b2067ac916
2 changed files with 40 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
components/onlinepackagemanager/opkman_downloader.pas
View File

@ -31,7 +31,7 @@ unit opkman_downloader;
interface
uses
Classes, SysUtils, fpjson,
Classes, SysUtils, fpjson, LazIDEIntf,
// OpkMan
opkman_timer, opkman_common, opkman_serializablepackages, opkman_const, opkman_options,
{$IFDEF FPC311}fphttpclient{$ELSE}opkman_httpclient{$ENDIF};
@ -279,7 +279,8 @@ begin
FHTTPClient.Terminate;
FErrMsg := rsMainFrm_rsMessageError2;
FErrTyp := etTimeOut;
FTimer.StopTimer;
if Assigned(FTimer) then
FTimer.StopTimer;
TThreadTimer(Sender).Synchronize(@DoOnJSONDownloadCompleted);
//Synchronize(@DoOnJSONDownloadCompleted);
FOnJSONComplete := nil;
@ -340,7 +341,7 @@ begin
FErrTyp := etConfig;
FErrMsg := rsMainFrm_rsMessageNoRepository0;
end;
if FTimer.Enabled then
if Assigned(FTimer) and FTimer.Enabled then
FTimer.StopTimer;
Synchronize(@DoOnJSONDownloadCompleted);
end
@ -432,7 +433,8 @@ begin
begin
FUSuccess := True;
Synchronize(@DoOnPackageUpdateCompleted);
FTimer.Enabled := True;
if Assigned(FTimer) then
FTimer.Enabled := True;
FCnt := 0;
FTotCnt := UpdCnt;
for I := 0 to SerializablePackages.Count - 1 do
@ -498,9 +500,12 @@ end;
destructor TThreadDownload.Destroy;
begin
if FTimer.Enabled then
FTimer.StopTimer;
FTimer.Terminate;
if Assigned(FTimer) then
begin
if FTimer.Enabled then
FTimer.StopTimer;
FTimer.Terminate;
end;
FHTTPClient.Free;
FMS.Free;
inherited Destroy;
@ -512,11 +517,14 @@ begin
FRemoteJSONFile := Options.RemoteRepository[Options.ActiveRepositoryIndex] + cRemoteJSONFile;
FDownloadType := dtJSON;
FSilent := ASilent;
FTimer := TThreadTimer.Create;
FTimer.Interval := ATimeOut;
FTimer.OnTimer := @DoOnTimer;
FTimer.StartTimer;
Start;
if (Assigned(LazarusIDE) and LazarusIDE.IDEStarted and (not LazarusIDE.IDEIsClosing)) then
begin
FTimer := TThreadTimer.Create;
FTimer.Interval := ATimeOut;
FTimer.OnTimer := @DoOnTimer;
FTimer.StartTimer;
Start;
end;
end;
procedure TThreadDownload.DownloadPackages(const ADownloadTo: String);
@ -535,10 +543,13 @@ begin
FTotSize := FTotSize + SerializablePackages.Items[I].RepositoryFileSize;
end;
end;
FTimer := TThreadTimer.Create;
FTimer.OnTimer := @DoOnTimer;
FTimer.StartTimer;
Start;
if (Assigned(LazarusIDE) and LazarusIDE.IDEStarted and (not LazarusIDE.IDEIsClosing)) then
begin
FTimer := TThreadTimer.Create;
FTimer.OnTimer := @DoOnTimer;
FTimer.StartTimer;
Start;
end;
end;
procedure TThreadDownload.DoReceivedUpdateSize(Sender: TObject;
@ -599,11 +610,14 @@ begin
for I := 0 to SerializablePackages.Count - 1 do
if (SerializablePackages.Items[I].Checked) and (Trim(SerializablePackages.Items[I].DownloadZipURL) <> '') then
Inc(FTotCnt);
FTimer := TThreadTimer.Create;
FTimer.OnTimer := @DoOnTimer;
FTimer.StartTimer;
FTimer.Enabled := False;
Start;
if (Assigned(LazarusIDE) and LazarusIDE.IDEStarted and (not LazarusIDE.IDEIsClosing)) then
begin
FTimer := TThreadTimer.Create;
FTimer.OnTimer := @DoOnTimer;
FTimer.StartTimer;
FTimer.Enabled := False;
Start;
end;
end;
{ TPackageDownloader}
@ -709,7 +723,8 @@ begin
if Assigned(FDownload) then
begin
FDownload.FHTTPClient.Terminate;
FDownload.FTimer.StopTimer;
if Assigned(FDownload.FTimer) then
FDownload.FTimer.StopTimer;
FDownload.NeedToBreak := True;
end;
end;

4
components/onlinepackagemanager/opkman_updates.pas
View File

@ -32,7 +32,7 @@ interface
uses
Classes, SysUtils, fpjson, fpjsonrtti, dateutils,
// LazUtils
Laz2_XMLCfg,
Laz2_XMLCfg, LazIDEIntf,
// OpkMan
opkman_serializablepackages, opkman_options, opkman_common,
{$IFDEF MSWINDOWS}
@ -525,6 +525,8 @@ begin
if FNeedToBreak then
Break;
JSON := '';
if (Assigned(LazarusIDE) and LazarusIDE.IDEIsClosing) then
Break;
if GetUpdateInfo(Trim(SerializablePackages.Items[I].DownloadURL), JSON) then
begin
if FUpdatePackage.LoadFromJSON(JSON) then