darktable/libgphoto2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

camlibs/ptp2: fuji: Also close jpg socket if connection fails

Browse Source
This commit is contained in:
Daniel Schulte
2021-03-16 09:53:34 +01:00
committed by Marcus Meissner
parent 0a356a664c
commit adea87b167
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
camlibs/ptp2/fujiptpip.c
View File

@@ -962,18 +962,21 @@ ptp_fujiptpip_connect (PTPParams* params, const char *address) {
perror ("connect cmd");
PTPSOCK_CLOSE (params->cmdfd);
PTPSOCK_CLOSE (params->evtfd);
PTPSOCK_CLOSE (params->jpgfd);
return GP_ERROR_IO;
}
ret = ptp_fujiptpip_init_command_request (params);
if (ret != PTP_RC_OK) {
PTPSOCK_CLOSE (params->cmdfd);
PTPSOCK_CLOSE (params->evtfd);
PTPSOCK_CLOSE (params->jpgfd);
return translate_ptp_result (ret);
}
ret = ptp_fujiptpip_init_command_ack (params);
if (ret != PTP_RC_OK) {
PTPSOCK_CLOSE (params->cmdfd);
PTPSOCK_CLOSE (params->evtfd);
PTPSOCK_CLOSE (params->jpgfd);
return translate_ptp_result (ret);
}
GP_LOG_D ("fujiptpip connected!");