Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions camlibs/ptp2/library.c
Original file line number Diff line number Diff line change
Expand Up @@ -4994,9 +4994,13 @@ camera_sony_capture (Camera *camera, CameraCaptureType type, CameraFilePath *pat
if (ptp_get_one_event(params, &event)) {
GP_LOG_D ("during wait for image event.code=%04x Param1=%08x", event.Code, event.Param1);
if (event.Code == PTP_EC_Sony_ObjectAdded) {
newobject = event.Param1;
GP_LOG_D ("SONY ObjectAdded received, ending wait");
break;
if (params->deviceinfo.Model && !strncmp(params->deviceinfo.Model, "ILCE-7", 6)) {
GP_LOG_D ("SONY ObjectAdded received, waiting for poll flag");
} else {
newobject = event.Param1;
GP_LOG_D ("SONY ObjectAdded received, ending wait");
break;
}
}
}
#endif
Expand Down
Loading