fix: navigate to directory of currently loaded file when user opens dialog for loading another file

ansgarbecker · ansgarbecker · commit 251f632a2ada · 2025-11-28T13:13:12.000+01:00
Refs #2268
diff --git a/source/main.pas b/source/main.pas
@@ -4935,12 +4935,15 @@ procedure TMainForm.actSaveSQLAsExecute(Sender: TObject);
   CanSave := mrNo;
   QueryTab := QueryTabs.ActiveTab;
   Dialog := TExtFileSaveDialog.Create(Self);
-  if QueryTab.MemoFilename.IsEmpty then
-    DefaultFilename := QueryTab.TabSheet.Caption
+  if QueryTab.MemoFilename.IsEmpty then begin
+    DefaultFilename := QueryTab.TabSheet.Caption;
+    DefaultFilename := DefaultFilename.Trim([' ', '*']);
+    DefaultFilename := ValidFilename(DefaultFilename);
+  end
   else
-    DefaultFilename := ExtractFileName(QueryTab.MemoFilename);
-  DefaultFilename := DefaultFilename.Trim([' ', '*']);
-  Dialog.FileName := ValidFilename(DefaultFilename);
+    DefaultFilename := QueryTab.MemoFilename;
+  Dialog.FileName := DefaultFilename;
+
   Dialog.Options := Dialog.Options + [ofOverwritePrompt];
   if (Sender = actSaveSQLSnippet) or (Sender = actSaveSQLSelectionSnippet) then begin
     Dialog.InitialDir := AppSettings.DirnameSnippets;
