From adea87b167a28fad6ef4a598cd726fa3aa010bf9 Mon Sep 17 00:00:00 2001 From: Daniel Schulte Date: Tue, 16 Mar 2021 09:53:34 +0100 Subject: [PATCH] camlibs/ptp2: fuji: Also close jpg socket if connection fails --- camlibs/ptp2/fujiptpip.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/camlibs/ptp2/fujiptpip.c b/camlibs/ptp2/fujiptpip.c index b74b4238c..e049b7305 100644 --- a/camlibs/ptp2/fujiptpip.c +++ b/camlibs/ptp2/fujiptpip.c @@ -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!");