Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sony A7 II&III: Live preview and capture then camera freezes #1082

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Sony A7 II&III: Live preview and capture then camera freezes #1082

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
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