From b0f975714ee12fb3d3b120e79464a15a01b22594 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Mon, 22 Apr 2019 10:46:15 +0100
Subject: [PATCH] Ensure initAdb() waits until adb is ready, rather than
 causing UI stalls

---
 renderdoc/android/android_tools.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/renderdoc/android/android_tools.cpp b/renderdoc/android/android_tools.cpp
index c4ceb56ae..57bd8eb08 100644
--- a/renderdoc/android/android_tools.cpp
+++ b/renderdoc/android/android_tools.cpp
@@ -341,7 +341,13 @@ void initAdb()
           "configure your SDK location");
   }
 
-  Process::LaunchProcess(adb.c_str(), workdir.c_str(), "start-server", true);
+  Process::ProcessResult res = {};
+  Process::LaunchProcess(adb.c_str(), workdir.c_str(), "start-server", true, &res);
+
+  if(res.strStdout.find("daemon"))
+  {
+    RDCLOG("Started adb server");
+  }
 }
 void shutdownAdb()
 {