Merging //UE4/Dev-Main to Dev-Mobile (//UE4/Dev-Mobile)

#rb None
#jira None

[CL 5826383 by Jack Porter in Dev-Mobile branch]
This commit is contained in:
Jack Porter
2019-04-11 06:05:49 -04:00
parent 67ffa1bcc7
commit 8d3bbb48b2
901 changed files with 41141 additions and 25763 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))
{