lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-05 14:21:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix adb existence check

Browse Source
This commit is contained in:
baldurk
2019-04-23 13:39:44 +01:00
parent e13671a72c
commit 9698d0c7b4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/android/android_tools.cpp
+2 -2
View File
@@ -333,7 +333,7 @@ void initAdb()
RDCLOG("Initialising adb using '%s'", adb.c_str());
if(adb.empty() || !FileIO::exists(adb.c_str()) || !FileIO::exists((adb + ".exe").c_str()))
if(adb.empty() || (!FileIO::exists(adb.c_str()) && !FileIO::exists((adb + ".exe").c_str())))
{
if(FileIO::FindFileInPath(adb.c_str()) == "")
RDCWARN(
@@ -344,7 +344,7 @@ void initAdb()
Process::ProcessResult res = {};
Process::LaunchProcess(adb.c_str(), workdir.c_str(), "start-server", true, &res);
if(res.strStdout.find("daemon"))
if(res.strStdout.find("daemon") != std::string::npos)
{
RDCLOG("Started adb server");
}