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

Changed some modal result checks to honour cancellation as mrNo. See merge request !281 issue #40920

Browse Source
This commit is contained in:
Martin 2024-05-20 02:35:01 +02:00
parent b593ba42f3
commit bab6ed4c4b
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/onlinepackagemanager/opkman_createrepositoryfrm.pas
View File

@ -368,7 +368,7 @@ begin
if TargetPackageFile <> APackageFile then
begin
if FileExists(TargetPackageFile) then
if MessageDlgEx(Format(rsCreateRepositoryFrm_Conf2, [TargetPackageFile]), mtInformation, [mbYes, mbNo], Self) = mrNo then
if MessageDlgEx(Format(rsCreateRepositoryFrm_Conf2, [TargetPackageFile]), mtInformation, [mbYes, mbNo], Self) <> mrYes then
Result := True;
if (not Result) and (not CopyFile(APackageFile, TargetPackageFile, [cffOverwriteFile], True)) then

4
components/onlinepackagemanager/opkman_updates.pas
View File

@ -335,8 +335,8 @@ begin
if OpenSSLFrm.cbPermanent.Checked then
begin
case OpenSSLFrm.ModalResult of
mrYes: Options.OpenSSLDownloadType := 0;
mrNo: Options.OpenSSLDownloadType := 2;
mrYes : Options.OpenSSLDownloadType := 0;
mrNo, mrCancel: Options.OpenSSLDownloadType := 2;
end
end;
finally

2
ide/buildmanager.pas
View File

@ -1762,7 +1762,7 @@ begin
if IDEMessageDialog(lisDeleteAmbiguousFile,
Format(lisAmbiguousFileFoundThisFileCanBeMistakenWithDelete,
[CurFilename, LineEnding, ShortFilename, LineEnding+LineEnding]),
mtConfirmation,[mbYes,mbNo])=mrNo
mtConfirmation,[mbYes,mbNo])<>mrYes
then continue;
end;
if EnvironmentOptions.AmbiguousFileAction in [afaAutoDelete,afaAsk]

2
packager/pkgmanager.pas
View File

@ -5716,7 +5716,7 @@ begin
Format(lisPkgMangThePackageWasMarkedCurrentlyLazarus,
[APackage.IDAsString, LineEnding, LineEnding+LineEnding]),
mtConfirmation,[mbYes,mbNo]);
if Result=mrNo then begin
if Result<>mrYes then begin
Result:=mrOk;
exit;
end;