move the initial liust folder after the apple hack

https://github.com/gphoto/libgphoto2/issues/132

1 files changed, 6 insertions, 5 deletions

diff --git a/camlibs/ptp2/library.c b/camlibs/ptp2/library.c
index 539b740a1..ea5fedca8 100644
--- a/camlibs/ptp2/library.c
+++ b/camlibs/ptp2/library.c
@@ -7960,11 +7960,6 @@ camera_init (Camera *camera, GPContext *context)
 	}
 #endif
 
-	/* avoid doing this on the Sonys DSLRs in control mode, they hang. :( */
-
-	if (params->deviceinfo.VendorExtensionID != PTP_VENDOR_SONY)
-		ptp_list_folder (params, PTP_HANDLER_SPECIAL, PTP_HANDLER_SPECIAL);
-
 	/* read the root directory to avoid the "DCIM WRONG ROOT" bugs */
 	CR (gp_filesystem_set_funcs (camera->fs, &fsfuncs, camera));
 
@@ -7997,6 +7992,12 @@ camera_init (Camera *camera, GPContext *context)
 		gp_port_set_timeout (camera->port, timeout);
 	}
 
+	/* avoid doing this on the Sonys DSLRs in control mode, they hang. :( */
+
+	if (params->deviceinfo.VendorExtensionID != PTP_VENDOR_SONY)
+		ptp_list_folder (params, PTP_HANDLER_SPECIAL, PTP_HANDLER_SPECIAL);
+
+
 	{
 		unsigned int k;