Fix #6766: Changelog window won't open (#10954)

This commit is contained in:
Aaron van Geffen 2020-03-17 21:38:15 +01:00 committed by GitHub
parent dcdc4f829a
commit a56a3fb804
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 8 deletions

View File

@ -11,6 +11,7 @@
- Change: [#1164] Use available translations for shortcut key bindings.
- Fix: [#2485] Hide Vertical Faces not applied to the edges of water.
- Fix: [#5249] No collision detection when building ride entrance at heights > 85.5m.
- Fix: [#6766] Changelog window doesn't open on some platforms.
- Fix: [#7784] Vehicle tab takes 1st car colour instead of tab_vehicle's colour.
- Fix: [#7854] Cannot build a custom spiral roller coaster design.
- Fix: [#7854] Empty entries in spiral roller coaster designs list.

View File

@ -136,6 +136,13 @@ namespace Platform
}
}
static std::string GetCurrentExecutableDirectory()
{
auto exePath = GetCurrentExecutablePath();
auto exeDirectory = Path::GetDirectory(exePath);
return exeDirectory;
}
std::string GetInstallPath()
{
auto path = std::string(gCustomOpenrctDataPath);
@ -145,8 +152,7 @@ namespace Platform
}
else
{
auto exePath = GetCurrentExecutablePath();
auto exeDirectory = Path::GetDirectory(exePath);
auto exeDirectory = GetCurrentExecutableDirectory();
path = Path::Combine(exeDirectory, "data");
}
return path;
@ -159,7 +165,7 @@ namespace Platform
std::string GetDocsPath()
{
return std::string();
return GetCurrentExecutableDirectory();
}
static SYSTEMTIME TimeToSystemTime(std::time_t timestamp)

View File

@ -42,11 +42,6 @@ namespace Platform
}
}
std::string GetDocsPath()
{
return std::string();
}
static std::string GetBundlePath()
{
@autoreleasepool {
@ -63,6 +58,11 @@ namespace Platform
}
}
std::string GetDocsPath()
{
return GetBundlePath();
}
std::string GetInstallPath()
{
auto path = std::string(gCustomOpenrctDataPath);