paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-05 12:37:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Converter: stop the scanning thread also when Cancel is clicked

Browse Source 
git-svn-id: trunk@38364 -
This commit is contained in:
juha 2012-08-25 05:26:14 +00:00
parent 084f17f010
commit 599ff107ba
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
converter/convertsettings.pas
View File

@ -152,9 +152,9 @@ type
UnitReplaceButton: TBitBtn;
ProjectPathEdit: TLabeledEdit;
CoordOffsButton: TBitBtn;
procedure CancelButtonClick(Sender: TObject);
procedure SameDfmCheckBoxChange(Sender: TObject);
procedure StopScanButtonClick(Sender: TObject);
procedure CancelButtonClick(Sender: TObject);
procedure SupportDelphiCheckBoxChange(Sender: TObject);
procedure TypeReplaceButtonClick(Sender: TObject);
procedure FuncReplaceButtonClick(Sender: TObject);
@ -864,10 +864,17 @@ begin
CoordOffsComboBox.Enabled:=not Chk;
end;
procedure TConvertSettingsForm.StopScanButtonClick(Sender: TObject);
begin
(fCacheUnitsThread as TCacheUnitsThread).Searcher.Stop; // Terminate;
end;
procedure TConvertSettingsForm.CancelButtonClick(Sender: TObject);
begin
if Assigned(fCacheUnitsThread) then
if Assigned(fCacheUnitsThread) then begin
(fCacheUnitsThread as TCacheUnitsThread).Searcher.Stop;
fCacheUnitsThread.WaitFor;
end;
end;
procedure TConvertSettingsForm.ThreadTerminated(Sender: TObject);
@ -879,11 +886,6 @@ begin
fCacheUnitsThread := nil; // Thread frees itself. Make the variable nil, too.
end;
procedure TConvertSettingsForm.StopScanButtonClick(Sender: TObject);
begin
(fCacheUnitsThread as TCacheUnitsThread).Searcher.Stop; // Terminate;
end;
// Edit replacements in grids
procedure TConvertSettingsForm.UnitReplaceButtonClick(Sender: TObject);