mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix #12945: Relative paths passed to -c were not made absolute (#12946)

pull/12956/head
Jonathan G Rennison 2024-09-21 13:58:28 +01:00 committed by GitHub
parent 6175a6b78a
commit 78c7dd1303
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/fileio.cpp
View File

@ -822,11 +822,11 @@ void DetermineBasePaths(const char *exe)
if (end == std::string::npos) { if (end == std::string::npos) {
/* _config_file is not in a folder, so use current directory. */ /* _config_file is not in a folder, so use current directory. */
tmp = cwd; tmp = cwd;
AppendPathSeparator(tmp);
_searchpaths[SP_WORKING_DIR] = tmp;
} else { } else {
_searchpaths[SP_WORKING_DIR] = _config_file.substr(0, end + 1); tmp = FS2OTTD(std::filesystem::weakly_canonical(std::filesystem::path(OTTD2FS(_config_file))).parent_path());
} }
AppendPathSeparator(tmp);
_searchpaths[SP_WORKING_DIR] = tmp;
} }
/* Change the working directory to that one of the executable */ /* Change the working directory to that one of the executable */