From 49f44c8ee12c5a4084140a9d8a8db8e431d98bf8 Mon Sep 17 00:00:00 2001 From: Martin Date: Thu, 25 Apr 2024 21:47:15 +0200 Subject: [PATCH] Fix checking modal result, handle mrCancel. Issue: #40920 --- .../onlinepackagemanager/opkman_createrepositoryfrm.pas | 2 +- components/onlinepackagemanager/opkman_mainfrm.pas | 2 +- .../onlinepackagemanager/opkman_repositorydetailsfrm.pas | 2 +- components/sqlite/sqlitecomponenteditor.pas | 2 +- ide/frames/editor_markup_userdefined.pas | 2 +- ide/packages/idedebugger/breakpointsdlg.pp | 4 ++-- ide/packages/idedebugger/historydlg.pp | 2 +- ide/packages/idedebugger/watchesdlg.pp | 2 +- tools/chmmaker/unit1.pas | 4 ++-- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/components/onlinepackagemanager/opkman_createrepositoryfrm.pas b/components/onlinepackagemanager/opkman_createrepositoryfrm.pas index fb39a44d26..e60daa04de 100644 --- a/components/onlinepackagemanager/opkman_createrepositoryfrm.pas +++ b/components/onlinepackagemanager/opkman_createrepositoryfrm.pas @@ -300,7 +300,7 @@ begin Data := FVSTPackages.GetNodeData(Node); if Data^.FDataType = 1 then begin - if MessageDlgEx(Format(rsCreateRepositoryFrm_Conf1, [Data^.FDisplayname]), mtConfirmation, [mbYes, mbNo], Self) = mrNo then + if MessageDlgEx(Format(rsCreateRepositoryFrm_Conf1, [Data^.FDisplayname]), mtConfirmation, [mbYes, mbNo], Self) <> mrYes then Exit; CanGo := False; PackageIndex := FSerializablePackages.FindPackageIndex(Data^.FName, fpbPackageName); diff --git a/components/onlinepackagemanager/opkman_mainfrm.pas b/components/onlinepackagemanager/opkman_mainfrm.pas index 221c7e6d53..c7b34920c2 100644 --- a/components/onlinepackagemanager/opkman_mainfrm.pas +++ b/components/onlinepackagemanager/opkman_mainfrm.pas @@ -1213,7 +1213,7 @@ var Node: PVirtualNode; MetaPkg: TMetaPackage; begin - if MessageDlgEx(rsMainFrm_miResetRating + '?', mtConfirmation, [mbYes, mbNo], Self) = mrNo then + if MessageDlgEx(rsMainFrm_miResetRating + '?', mtConfirmation, [mbYes, mbNo], Self) <> mrYes then Exit; Node := VisualTree.VST.GetFirstSelected; if Node <> nil then diff --git a/components/onlinepackagemanager/opkman_repositorydetailsfrm.pas b/components/onlinepackagemanager/opkman_repositorydetailsfrm.pas index 5ec346e68b..7edf66594e 100644 --- a/components/onlinepackagemanager/opkman_repositorydetailsfrm.pas +++ b/components/onlinepackagemanager/opkman_repositorydetailsfrm.pas @@ -93,7 +93,7 @@ begin if SDRep.Execute then begin if (not IsDirectoryEmpty(ExtractFilePath(SDRep.FileName))) then - if MessageDlgEx(Format(rsCreateRepositoryFrm_Info1, [ExtractFilePath(SDRep.FileName)]), mtConfirmation, [mbYes, mbNo], Self) = mrNo then + if MessageDlgEx(Format(rsCreateRepositoryFrm_Info1, [ExtractFilePath(SDRep.FileName)]), mtConfirmation, [mbYes, mbNo], Self) <> mrYes then Exit; if not DirectoryIsWritable(ExtractFilePath(SDRep.FileName)) then begin diff --git a/components/sqlite/sqlitecomponenteditor.pas b/components/sqlite/sqlitecomponenteditor.pas index b747933121..57253178e6 100644 --- a/components/sqlite/sqlitecomponenteditor.pas +++ b/components/sqlite/sqlitecomponenteditor.pas @@ -289,7 +289,7 @@ begin if Dataset.TableExists then begin if MessageDlg(Format(sATableNamedAlreadyExistsAreYouSureYouWantToReplace, [Dataset.TableName, LineEnding]), - mtWarning,[mbYes,MbNo],0) = mrNo then + mtWarning,[mbYes,mbNo],0) <> mrYes then exit else DataSet.ExecSQL('DROP TABLE '+DataSet.TableName+';'); diff --git a/ide/frames/editor_markup_userdefined.pas b/ide/frames/editor_markup_userdefined.pas index 1978b17590..68cd03849c 100644 --- a/ide/frames/editor_markup_userdefined.pas +++ b/ide/frames/editor_markup_userdefined.pas @@ -306,7 +306,7 @@ begin if IDEMessageDialog(dlgMarkupUserDefinedDelCaption, Format(dlgMarkupUserDefinedDelPrompt, [FUserWords.Name]), - mtConfirmation, mbYesNo) = mrNo + mtConfirmation, mbYesNo) <> mrYes then exit; diff --git a/ide/packages/idedebugger/breakpointsdlg.pp b/ide/packages/idedebugger/breakpointsdlg.pp index 4447ae524a..8fbac50b48 100644 --- a/ide/packages/idedebugger/breakpointsdlg.pp +++ b/ide/packages/idedebugger/breakpointsdlg.pp @@ -852,7 +852,7 @@ begin if EnvironmentDebugOpts.ConfirmDeleteFileBreakPoints then begin MsgResult:=TaskDlg(lisDeleteAllBreakpoints, lisDeleteAllBreakpoints2, '', tdiQuestion, [mbYes, mbNo], dbgDoNotShowThisMessageAgain, NotAgain); - if MsgResult = mrNo then + if MsgResult <> mrYes then exit; if NotAgain then EnvironmentDebugOpts.ConfirmDeleteFileBreakPoints:= False; @@ -927,7 +927,7 @@ begin if EnvironmentDebugOpts.ConfirmDeleteAllBreakPoints then begin MsgResult:=TaskDlg(lisDeleteAllBreakpoints, lisDeleteAllBreakpoints, '', tdiQuestion, [mbYes, mbNo], dbgDoNotShowThisMessageAgain, NotAgain); - if MsgResult = mrNo then + if MsgResult <> mrYes then exit; if NotAgain then EnvironmentDebugOpts.ConfirmDeleteAllBreakPoints := False; diff --git a/ide/packages/idedebugger/historydlg.pp b/ide/packages/idedebugger/historydlg.pp index 83019e233e..d67733ce20 100644 --- a/ide/packages/idedebugger/historydlg.pp +++ b/ide/packages/idedebugger/historydlg.pp @@ -125,7 +125,7 @@ begin if EnvironmentDebugOpts.ConfirmDeleteAllHistory then begin MsgResult:=TaskDlg(dlgHistoryDeleteAllConfirm, dlgHistoryDeleteAllConfirm, '', tdiQuestion, [mbYes, mbNo], dbgDoNotShowThisMessageAgain, NotAgain); - if MsgResult = mrNo then + if MsgResult <> mrYes then exit; if NotAgain then EnvironmentDebugOpts.ConfirmDeleteAllHistory := False; diff --git a/ide/packages/idedebugger/watchesdlg.pp b/ide/packages/idedebugger/watchesdlg.pp index fdee01be6d..ba202f8141 100644 --- a/ide/packages/idedebugger/watchesdlg.pp +++ b/ide/packages/idedebugger/watchesdlg.pp @@ -908,7 +908,7 @@ begin if EnvironmentDebugOpts.ConfirmDeleteAllWatches then begin MsgResult:=TaskDlg(dlgWatchesDeleteAllConfirm, dlgWatchesDeleteAllConfirm, '', tdiQuestion, [mbYes, mbNo], dbgDoNotShowThisMessageAgain, NotAgain); - if MsgResult = mrNo then + if MsgResult <> mrYes then exit; if NotAgain then EnvironmentDebugOpts.ConfirmDeleteAllWatches := False; diff --git a/tools/chmmaker/unit1.pas b/tools/chmmaker/unit1.pas index 27cca22dfc..ec46108fe6 100644 --- a/tools/chmmaker/unit1.pas +++ b/tools/chmmaker/unit1.pas @@ -181,7 +181,7 @@ var begin if MessageDlg('This will add all files in the project directory ' + LineEnding + 'recursively. Do you want to continue?', - mtConfirmation, [mbYes, mbNo],0) = mrNo then exit; + mtConfirmation, [mbYes, mbNo],0) <> mrYes then exit; Modified := True; Files := TStringList.Create; try @@ -384,7 +384,7 @@ begin If SaveDialog1.Execute then begin if FileExists(SaveDialog1.FileName) - and (MessageDlg('File Already Exists! Ovewrite?', mtWarning, [mbYes, mbNo],0) = mrNo) then Exit; + and (MessageDlg('File Already Exists! Ovewrite?', mtWarning, [mbYes, mbNo],0) <> mrYes) then Exit; OpenProject(SaveDialog1.FileName); Project.SaveToFile(SaveDialog1.FileName); end;