preflight: don't wait for trust if device is at setup screen

libimobiledevice · Apr 4, 2014 · f078c3d · f078c3d
1 parent 7ec4491
commit f078c3d
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/preflight.c b/src/preflight.c
@@ -192,7 +192,12 @@ static void* preflight_worker_handle_device_add(void* userdata)
 
 		/* 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;