fix: prompt to overwrite only if file exists

ansgarbecker · ansgarbecker · commit 91de2fc30d05 · 2025-11-27T19:43:51.000+01:00
Refs #2268
diff --git a/source/extfiledialog.pas b/source/extfiledialog.pas
@@ -178,20 +178,19 @@ procedure TfrmExtFileDialog.FormCloseQuery(Sender: TObject;
   var CanClose: Boolean);
 begin
   CanClose := True;
-  if ModalResult = mrOK then begin
 
-    if FileName.IsEmpty then begin
-      CanClose := False;
-    end;
+  if ModalResult = mrCancel then
+    Exit;
 
-    if (not FileName.IsEmpty) and (Self is TExtFileSaveDialog) and (ofOverwritePrompt in FOptions) then begin
-      case MessageDialog(f_('File already exists: %s'+sLineBreak+sLineBreak+'Overwrite it?', [FileName]), mtConfirmation, [mbYes, mbNo]) of
-        mrNo: begin
-          CanClose := False;
-        end;
-      end;
-    end;
+  // Do nothing when user clicks OK without a selected file. Imitates Windows behaviour.
+  if FileName.IsEmpty then begin
+    CanClose := False;
+    Exit;
+  end;
 
+  // Ask user whether to overwrite the selected file
+  if (Self is TExtFileSaveDialog) and (ofOverwritePrompt in FOptions) and (FileExists(FileName)) then begin
+    CanClose := MessageDialog(f_('File already exists: %s'+sLineBreak+sLineBreak+'Overwrite it?', [FileName]), mtConfirmation, [mbYes, mbNo]) = mrYes;
   end;
 end;
 
