Sanitize Overwrite and DirDelete dialog response values

Also respect localized button accelerators

1 files changed, 6 insertions, 6 deletions

diff --git a/UCore.pas b/UCore.pas
index bd68d46..b4425c3 100644
--- a/UCore.pas
+++ b/UCore.pas
@@ -620,7 +620,7 @@ var AFSymLink: TFSymlink;
       try
         FDirDelete := TFDirDelete.Create(AFSymlink);
         FDirDelete.Caption := LANGDialogMakeSymlink;
-        FDirDelete.AddButtons(2);
+        FDirDelete.AddButtons(DIR_DELETE_SET_SYMLINK_ERROR);
         FDirDelete.Label1.Caption := LANGTheSymbolicLink;
         FDirDelete.Label2.Caption := NewName;
         FDirDelete.Label3.Caption := Format(LANGCouldNotBeCreatedS, [Error^.message]);
@@ -631,7 +631,7 @@ var AFSymLink: TFSymlink;
         FDirDelete.Free;
       end;
       case Response of
-        1 : Result := HandleCreateSymlink(OldName, NewName);
+        DIR_DELETE_RETRY : Result := HandleCreateSymlink(OldName, NewName);
         else Result := False;
       end;
     end;
@@ -672,7 +672,7 @@ var Data: PDataItem;
       try
         FDirDelete := TFDirDelete.Create(AFSymlink);
         FDirDelete.Caption := LANGDialogEditSymlink;
-        FDirDelete.AddButtons(2);
+        FDirDelete.AddButtons(DIR_DELETE_SET_SYMLINK_ERROR);
         FDirDelete.Label1.Caption := LANGTheSymbolicLink;
         FDirDelete.Label2.Caption := StrToUTF8(ExistingName);
         FDirDelete.Label3.Caption := Format(LANGCouldNotBeDeletedS, [Error^.message]);
@@ -683,7 +683,7 @@ var Data: PDataItem;
         FDirDelete.Free;
       end;
       case Response of
-        1 : HandleEditSymlink(ExistingName, PointTo);
+        DIR_DELETE_RETRY : HandleEditSymlink(ExistingName, PointTo);
       end;
       Exit;
     end;
@@ -694,7 +694,7 @@ var Data: PDataItem;
       try
         FDirDelete := TFDirDelete.Create(AFSymlink);
         FDirDelete.Caption := LANGDialogMakeSymlink;
-        FDirDelete.AddButtons(2);
+        FDirDelete.AddButtons(DIR_DELETE_SET_SYMLINK_ERROR);
         FDirDelete.Label1.Caption := LANGTheSymbolicLink;
         FDirDelete.Label2.Caption := StrToUTF8(ExistingName);
         FDirDelete.Label3.Caption := Format(LANGCouldNotBeCreatedS, [Error^.message]);
@@ -705,7 +705,7 @@ var Data: PDataItem;
         FDirDelete.Free;
       end;
       case Response of
-        1 : Result := HandleEditSymlink(ExistingName, PointTo);
+        DIR_DELETE_RETRY : Result := HandleEditSymlink(ExistingName, PointTo);
         else Result := False;
       end;
     end;