fix: do not auto-create c:\users\mike\AppData\Roaming\HeidiSQL\ in portable mode, through the default value of asLogFilePath

This makes DirnameUserAppData and DirnameUserDocuments the only ones being aware of portable mode

Refs #2450

Author: ansgarbecker

source/apphelpers.pas

@@ -3780,7 +3780,6 @@ constructor TAppSettings.Create;
 var
   rx: TRegExpr;
   i: Integer;
-  DefaultSnippetsDirectory: String;
   PortableLockFile: String;
   NewFileHandle: THandle;
 begin
@@ -4058,14 +4057,7 @@ constructor TAppSettings.Create;
   InitSetting(asDisplayReverseForeignKeys,        'DisplayReverseForeignKeys',             0, False);
   InitSetting(asGenerateDataNumRows,              'GenerateDataNumRows',                   1000);
   InitSetting(asGenerateDataNullAmount,           'GenerateDataNullAmount',                10);
-
-  // Default folder for snippets
-  if FPortableMode then
-    DefaultSnippetsDirectory := GetAppDir
-  else
-    DefaultSnippetsDirectory := DirnameUserDocuments;
-  DefaultSnippetsDirectory := DefaultSnippetsDirectory + 'Snippets\';
-  InitSetting(asCustomSnippetsDirectory,          'CustomSnippetsDirectory',               0, False, DefaultSnippetsDirectory);
+  InitSetting(asCustomSnippetsDirectory,          'CustomSnippetsDirectory',               0, False, DirnameUserDocuments + 'Snippets\');
   InitSetting(asPromptSaveFileOnTabClose,         'PromptSaveFileOnTabClose',              0, True);
   // Restore tabs feature crashes often on old XP systems, see https://www.heidisql.com/forum.php?t=34044
   InitSetting(asRestoreTabs,                      'RestoreTabs',                           0, Win32MajorVersion >= 6);
@@ -4723,19 +4715,29 @@ function TAppSettings.ExportSettings: Boolean;
 
 function TAppSettings.DirnameUserAppData: String;
 begin
-  // User folder for HeidiSQL's data (<user name>\Application Data)
-  Result := GetShellFolder(FOLDERID_RoamingAppData) + '\' + APPNAME + '\';
-  if not DirectoryExists(Result) then begin
-    ForceDirectories(Result);
+  // C:\Users\mike\AppData\Roaming\HeidiSQL\
+  if PortableMode then begin
+    Result := GetAppDir;
+  end
+  else begin
+    Result := GetShellFolder(FOLDERID_RoamingAppData) + '\' + APPNAME + '\';
+    if not DirectoryExists(Result) then begin
+      ForceDirectories(Result);
+    end;
   end;
 end;
 
 
 function TAppSettings.DirnameUserDocuments: String;
 begin
-  // "HeidiSQL" folder under user's documents folder, e.g. c:\Users\Mike\Documents\HeidiSQL\
-  Result := GetShellFolder(FOLDERID_Documents) + '\' + APPNAME + '\';
-  // Do not auto-create it, as we only use it for snippets which can also have a custom path.
+  // C:\Users\mike\Documents\HeidiSQL\
+  if PortableMode then begin
+    Result := GetAppDir;
+  end
+  else begin
+    Result := GetShellFolder(FOLDERID_Documents) + '\' + APPNAME + '\';
+    // Do not auto-create it, as we only use it for snippets which can also have a custom path.
+  end;
 end;
 
 
@@ -4755,11 +4757,7 @@ function TAppSettings.DirnameSnippets: String;
 function TAppSettings.DirnameBackups: String;
 begin
   // Create backup folder if it does not exist and return it
-  if PortableMode then begin
-    Result := GetAppDir + 'Backups\'
-  end else begin
-    Result := DirnameUserAppData + 'Backups\';
-  end;
+  Result := DirnameUserAppData + 'Backups\';
   if not DirectoryExists(Result) then begin
     ForceDirectories(Result);
   end;
@@ -4768,11 +4766,7 @@ function TAppSettings.DirnameBackups: String;
 
 function TAppSettings.DirnameHighlighters: string;
 begin
-  if PortableMode then begin
-    Result := GetAppDir + 'Highlighters\'
-  end else begin
-    Result := DirnameUserAppData + 'Highlighters\';
-  end;
+  Result := DirnameUserAppData + 'Highlighters\';
   if not DirectoryExists(Result) then begin
     ForceDirectories(Result);
   end;

source/main.pas

@@ -2369,10 +2369,7 @@ function TMainForm.InitTabsIniFile: TIniFile;
 begin
   // Try to open tabs.ini for writing or reading
   // Taking multiple application instances into account
-  if AppSettings.PortableMode then
-    TabsIniFilename := GetAppDir + 'tabs.ini'
-  else
-    TabsIniFilename := AppSettings.DirnameUserAppData + 'tabs.ini';
+  TabsIniFilename := AppSettings.DirnameUserAppData + 'tabs.ini';
   WaitingSince := GetTickCount64;
   Attempts := 0;
   while not FileIsWritable(TabsIniFilename) do begin