again retrieve rootfolder, but avoid Sonys

git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14886 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Marcus Meissner
2014-04-09 07:07:31 +00:00
parent 97507e3d04
commit b607792afe

View File

@@ -7179,9 +7179,12 @@ camera_init (Camera *camera, GPContext *context)
ptp_getfilesystemmanifest (params, 0x00010001, 0, 0, &data);
}
#endif
/* hmm ...
ptp_list_folder (params, PTP_HANDLER_SPECIAL, PTP_HANDLER_SPECIAL);
*/
/* 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));
{