From 9698d0c7b4ff800323f67001298f1e0ea114033b Mon Sep 17 00:00:00 2001 From: baldurk Date: Tue, 23 Apr 2019 13:37:44 +0100 Subject: [PATCH] Fix adb existence check --- renderdoc/android/android_tools.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/renderdoc/android/android_tools.cpp b/renderdoc/android/android_tools.cpp index 57bd8eb08..bbf3703f2 100644 --- a/renderdoc/android/android_tools.cpp +++ b/renderdoc/android/android_tools.cpp @@ -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"); }