handle getobject failure in ptp_object_want

git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@12904 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Marcus Meissner
2010-04-05 20:08:27 +00:00
parent 713926b81c
commit f84c61b2bf

View File

@@ -4942,8 +4942,11 @@ ptp_object_want (PTPParams *params, uint32_t handle, int want, PTPObject **retob
saveparent = ob->oi.ParentObject;
ret = ptp_getobjectinfo (params, handle, &ob->oi);
if (ret != PTP_RC_OK)
if (ret != PTP_RC_OK) {
/* kill it from the internal list ... */
ptp_remove_object_from_cache(params, handle);
return ret;
}
if (!ob->oi.Filename) ob->oi.Filename=strdup("<none>");
if (ob->flags & PTPOBJECT_PARENTOBJECT_LOADED)
ob->oi.ParentObject = saveparent;