Changeset 405 for branches/highdpi/Packages/CevoComponents/Directories.pas

Timestamp:

Nov 3, 2021, 11:22:02 AM (2 years ago)

Author:

chronos

Message:

• Modified: Merged changes from trunk r404.

File:

• branches/highdpi/Packages/CevoComponents/Directories.pas (modified) (3 diffs)

branches/highdpi/Packages/CevoComponents/Directories.pas

@@ -67 +67 @@
   Src, Dst: TSearchRec;
 begin
-  if not DirectoryExists(DestinationDir) then CreateDir(DestinationDir);
+  if not DirectoryExists(DestinationDir) then ForceDirectories(DestinationDir);
   if FindFirst(SourceDir + DirectorySeparator + Filter, $21, Src) = 0 then
     repeat
@@ -79 +79 @@
 end;
 
+procedure CopyFiles;
+begin
+  if DirectoryExists(GetSavedDir(True)) and not DirectoryExists(GetSavedDir(False)) then
+    CopyDir(GetSavedDir(True), GetSavedDir(False), '*.*');
+  if DirectoryExists(GetMapsDir(True)) and not DirectoryExists(GetMapsDir(False)) then
+    CopyDir(GetMapsDir(True), GetMapsDir(False), '*.*');
+end;
+
 procedure UnitInit;
 var
@@ -87 +95 @@
 
   AppDataDir := GetAppConfigDir(False);
-  if AppDataDir = '' then
-    DataDir := HomeDir
-  else
-  begin
-    if not DirectoryExists(AppDataDir) then CreateDir(AppDataDir);
+  if AppDataDir = '' then DataDir := HomeDir
+  else begin
+    if not DirectoryExists(AppDataDir) then ForceDirectories(AppDataDir);
     DataDir := AppDataDir;
   end;
-
-  CopyDir(GetSavedDir(True), GetSavedDir(False), '*.*');
-  CopyDir(GetMapsDir(True), GetMapsDir(False), '*.*');
+  CopyFiles;
 end;