From 1c77c9545c1000e0b808b5181e40e7e9064fc75b Mon Sep 17 00:00:00 2001
From: Nikias Bassen
Date: Tue, 24 Sep 2013 20:25:37 +0200
Subject: preflight: don't wait for trust if device is at setup screen

---
 src/preflight.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/preflight.c b/src/preflight.c
index 97fdb8b..c40311c 100644
--- a/src/preflight.c
+++ b/src/preflight.c
@@ -192,7 +192,12 @@ retry:
 
 		/* if not paired, trigger the trust dialog to make sure it appears */
 		if (!is_device_paired) {
-			lockdownd_pair(lockdown, NULL);
+			if (lockdownd_pair(lockdown, NULL) == LOCKDOWN_E_SUCCESS) {
+				/* if device is still showing the setup screen it will pair even without trust dialog */
+				usbmuxd_log(LL_INFO, "%s: Pair success for device %s", __func__, _dev->udid);
+				client_device_add(info);
+				goto leave;
+			}
 		}
 
 		lockdownd_service_descriptor_t service = NULL;
-- 
cgit v1.1-32-gdbae