summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Nikias Bassen2013-09-24 20:25:37 +0200
committerGravatar Nikias Bassen2013-09-24 20:25:37 +0200
commit1c77c9545c1000e0b808b5181e40e7e9064fc75b (patch)
tree8503145a8470f8b3dd08eec7f1051b653921315b
parent4356659dfad264fb89bfcf0e4410797db4e908a8 (diff)
downloadusbmuxd-1c77c9545c1000e0b808b5181e40e7e9064fc75b.tar.gz
usbmuxd-1c77c9545c1000e0b808b5181e40e7e9064fc75b.tar.bz2
preflight: don't wait for trust if device is at setup screen
-rw-r--r--src/preflight.c7
1 files changed, 6 insertions, 1 deletions
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;