izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merging using //UE5/Main_to_//UE5/Release-Engine-Staging @14384769

Browse Source 
autoresolved files
#rb none

[CL 14384911 by Marcus Wassmer in ue5-main branch]
This commit is contained in:
Marcus Wassmer
2020-09-24 00:43:27 -04:00
parent 6638f126f7
commit 3b81cf8201
13529 changed files with 2378633 additions and 444266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Engine/Source/Developer/Android/AndroidDeviceDetection/Private/AndroidDeviceDetectionModule.cpp
View File

@@ -122,13 +122,16 @@ private:
OutStdErr = &DefaultError;
}
FPlatformProcess::ExecProcess(*ADBPath, *CommandLine, &ReturnCode, OutStdOut, OutStdErr);
if (ReturnCode != 0)
if (FPaths::FileExists(*ADBPath))
{
FPlatformMisc::LowLevelOutputDebugStringf(TEXT("The Android SDK command '%s' failed to run. Return code: %d, Error: %s\n"), *CommandLine, ReturnCode, **OutStdErr);
FPlatformProcess::ExecProcess(*ADBPath, *CommandLine, &ReturnCode, OutStdOut, OutStdErr);
return false;
if (ReturnCode != 0)
{
FPlatformMisc::LowLevelOutputDebugStringf(TEXT("The Android SDK command '%s' failed to run. Return code: %d, Error: %s\n"), *CommandLine, ReturnCode, **OutStdErr);
return false;
}
}
return true;