Changeset 116 for tags/1.1.1/Engine.pas

Timestamp:

Jan 14, 2025, 10:04:04 AM (8 days ago)

Author:

chronos

Message:

Merged revision(s) 114-115 from trunk:

• Fixed: Linux data directories detection.
• Added: French translation.

Location:

tags/1.1.1

Files:

• . (modified) (1 prop)
• Engine.pas (modified) (1 diff)

tags/1.1.1/Engine.pas

@@ -1647 +1647 @@
 {$IFDEF UNIX}
 const
-  UnixDataDir = '/usr/share/Tunneler';
-  UnixAudioDir = UnixDataDir + '/Audio';
+  AudioDirName = 'Audio';
+  UnixDataDir = '../share/Tunneler';
+var
+  NewDir: string;
+  BaseDir: string;
 {$ENDIF}
 begin
-  Result := GetCurrentDir + DirectorySeparator + 'Audio';
+  BaseDir := ExcludeTrailingPathDelimiter(ExtractFilePath(ParamStr(0)));
+  Result := BaseDir + DirectorySeparator + AudioDirName;
   {$IFDEF UNIX}
-  if not DirectoryExists(Result) and DirectoryExists(UnixAudioDir) then begin
-    Result := UnixAudioDir;
-    Exit;
+  NewDir := ExpandFileName(BaseDir + DirectorySeparator + UnixDataDir +
+    DirectorySeparator + AudioDirName);
+  if not DirectoryExists(Result) and DirectoryExists(NewDir) then begin
+    Result := NewDir;
   end;
   {$ENDIF}