Integrating github/staging through commit ab87ed9
This commit is contained in:
@@ -514,7 +514,6 @@ namespace LumberyardLauncher
|
||||
bool allowedEngineConnection = !systemInitParams.bToolMode && !systemInitParams.bTestMode && bg_ConnectToAssetProcessor;
|
||||
|
||||
//connect to the asset processor using the bootstrap values
|
||||
bool connectedToAssetProcessor = false;
|
||||
if (allowedEngineConnection)
|
||||
{
|
||||
if (!ConnectToAssetProcessor())
|
||||
@@ -572,8 +571,10 @@ namespace LumberyardLauncher
|
||||
AZ_TracePrintf("Launcher", "Application is configured for VFS");
|
||||
AZ_TracePrintf("Launcher", "Log and cache files will be written to the Cache directory on your host PC");
|
||||
|
||||
#if defined(AZ_ENABLE_TRACING)
|
||||
const char* message = "If your game does not run, check any of the following:\n"
|
||||
"\t- Verify the remote_ip address is correct in bootstrap.cfg";
|
||||
#endif
|
||||
|
||||
if (mainInfo.m_additionalVfsResolution)
|
||||
{
|
||||
@@ -640,6 +641,7 @@ namespace LumberyardLauncher
|
||||
}
|
||||
|
||||
#if !defined(AZ_MONOLITHIC_BUILD)
|
||||
delete systemInitParams.pSystem;
|
||||
crySystemLibrary.reset(nullptr);
|
||||
#endif // !defined(AZ_MONOLITHIC_BUILD)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user