Skip to content

Made the startup script more resilient for platforms that don't suppl… #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Unarmed1000 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Made the startup script more resilient for platforms that don't suppl… #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion DemoFramework/FslDemoPlatform/source/FslDemoPlatform/Configuration/Console/DemoMain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@

#include <FslBase/IO/Directory.hpp>
#include <FslBase/IO/Path.hpp>
#include <FslBase/Log/IO/FmtPath.hpp>
#include <FslBase/Log/Log3Fmt.hpp>
#include <FslDemoPlatform/DemoRunner.hpp>
#include <csignal>
Expand All @@ -48,14 +49,21 @@ int main(int argc, char* argv[])
if (argc >= 1 && argv[0] != nullptr)
{
strContentPath = Fsl::IO::Path::GetDirectoryName(argv[0]);
if (strContentPath.IsEmpty())
{
FSLLOG3_WARNING_IF(strContentPath.IsEmpty(),
"could not get directory information from the exe file argument: '{}', trying to use '.' to resolve it", argv[0])
strContentPath = ".";
}
}
else
{
strContentPath = Fsl::IO::Directory::GetCurrentWorkingDirectory();
FSLLOG3_WARNING("Could not find the exe path, trying to use current working directory instead.");
}

strContentPath = Fsl::IO::Path::GetFullPath(strContentPath);
// Only try to resolve the full path if we have a path to begin with.
strContentPath = !strContentPath.IsEmpty() ? Fsl::IO::Path::GetFullPath(strContentPath) : strContentPath;

strPersistentPath = strContentPath;
strContentPath = Fsl::IO::Path::Combine(strContentPath, "Content");
Expand Down