Test Android target connection for up to MaxConnectTimeout seconds.

Added new setting to SettingsDialog, and passed it to native code via
RenderDoc::Inst().GetConfigSetting("MaxConnectTimeout")
This commit is contained in:
Michael Rennie
2016-12-24 19:22:10 +00:00
committed by Baldur Karlsson
parent 31104c817a
commit d249faacd3
7 changed files with 125 additions and 47 deletions
+3 -2
View File
@@ -1170,8 +1170,9 @@ extern "C" RENDERDOC_API uint32_t RENDERDOC_CC
RemoteServer_ExecuteAndInject(RemoteServer *remote, const char *app, const char *workingDir,
const char *cmdLine, void *env, const CaptureOptions *opts)
{
if(Android::IsHostADB(remote->hostname().c_str()))
return Android::StartAndroidPackageForCapture(app);
const char *host = remote->hostname().c_str();
if(Android::IsHostADB(host))
return Android::StartAndroidPackageForCapture(host, app);
return remote->ExecuteAndInject(app, workingDir, cmdLine, env, opts);
}