Merging //UE4/Dev-Main@5808119 to Dev-Rendering (//UE4/Dev-Rendering)

#rnx
#rb none

[CL 5809094 by Rolando Caloca in Dev-Rendering branch]
This commit is contained in:
Rolando Caloca
2019-04-09 12:22:27 -04:00
parent 9a6b36a11e
commit ee36390eaa
662 changed files with 33473 additions and 16436 deletions

View File

@@ -350,7 +350,13 @@ void FHTML5TargetPlatform::PopulateDevices(TArray<FString>& DeviceMaps, FString
if( FParse::Value( *It, TEXT( "BrowserName=" ), DeviceName ) && !DeviceName.IsEmpty() &&
FParse::Value( *It, TEXT( "BrowserPath=(FilePath=" ), DevicePath ) && !DevicePath.IsEmpty() )
{
#if PLATFORM_WINDOWS
if ( DeviceName.StartsWith( TEXT( "Canary" ) ) )
{
FString UserName = FPlatformMisc::GetEnvironmentVariable(TEXT("USRENAME"));
DevicePath.Replace( TEXT("your_username"), *UserName );
}
#endif
if (FPlatformFileManager::Get().GetPlatformFile().FileExists(*DevicePath) ||
FPlatformFileManager::Get().GetPlatformFile().DirectoryExists(*DevicePath))
{