diff options
author | Marcus Meissner <marcus@jet.franken.de> | 2009-05-13 14:56:48 +0000 |
---|---|---|
committer | Marcus Meissner <marcus@jet.franken.de> | 2009-05-13 14:56:48 +0000 |
commit | 90d478514bf5a87f615e429cf056343df853a585 (patch) | |
tree | 3e39691956996df7017b51150cf8de12ac83157f | |
parent | a97c68231d5dfb8c6358b92d54b7d3ab966358d1 (diff) | |
download | libgphoto2-90d478514bf5a87f615e429cf056343df853a585.tar.gz |
uilocking
git-svn-id: https://svn.code.sf.net/p/gphoto/code/branches/libgphoto2-2_4/libgphoto2@12066 67ed7778-7388-44ab-90cf-0a291f65f57c
-rw-r--r-- | camlibs/ptp2/library.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/camlibs/ptp2/library.c b/camlibs/ptp2/library.c index 708d3c4e1..efc79e420 100644 --- a/camlibs/ptp2/library.c +++ b/camlibs/ptp2/library.c @@ -1749,11 +1749,23 @@ camera_canon_eos_capture (Camera *camera, CameraCaptureType type, CameraFilePath nrofentries = 0; entries = NULL; } + ret = ptp_canon_eos_setuilock(params); + if (ret != PTP_RC_OK) { + gp_log (GP_LOG_ERROR,"ptp2_prepare_eos_capture", "set uilock failed!"); + return GP_ERROR; + } + ret = ptp_canon_eos_capture (params); if (ret != PTP_RC_OK) { gp_context_error (context, _("Canon EOS Capture failed: %x"), ret); return GP_ERROR; } + ret = ptp_canon_eos_setuilock(params); + if (ret != PTP_RC_OK) { + gp_log (GP_LOG_ERROR,"ptp2_prepare_eos_capture", "reset uilock failed!"); + return GP_ERROR; + } + newobject = 0; while ((time(NULL)-capture_start)<=EOS_CAPTURE_TIMEOUT) { int i; |