summaryrefslogtreecommitdiff
path: root/camlibs/ptp2/library.c
diff options
context:
space:
mode:
Diffstat (limited to 'camlibs/ptp2/library.c')
-rw-r--r--camlibs/ptp2/library.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/camlibs/ptp2/library.c b/camlibs/ptp2/library.c
index 770fb9d70..c271317e7 100644
--- a/camlibs/ptp2/library.c
+++ b/camlibs/ptp2/library.c
@@ -5857,9 +5857,11 @@ camera_trigger_canon_eos_capture (Camera *camera, GPContext *context)
C_PTP (ptp_canon_eos_getdevicepropdesc (params, PTP_DPC_CANON_EOS_AvailableShots, &dpd));
if (dpd.CurrentValue.u32 < 100) {
/* Tell the camera we have enough free space on the PC */
- ptp_canon_eos_setuilock(params);
+ if (!params->uilocked)
+ ptp_canon_eos_setuilock(params);
LOG_ON_PTP_E (ptp_canon_eos_pchddcapacity(params, 0x0fffffff, 0x00001000, 0x00000001));
- ptp_canon_eos_resetuilock(params);
+ if (!params->uilocked)
+ ptp_canon_eos_resetuilock(params);
}
}
}