diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2015-03-22 21:19:55 +0000 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2015-03-22 21:19:55 +0000 |
| commit | f19c373aaef9d0edee1c08d34edf2d535dff2141 (patch) | |
| tree | fad4f952fd188a0ba5de38231abbfe5ba1e294d6 /camlibs/canon | |
| parent | 68f94f7d75447b70ac5e32d3adbf1bde965788f8 (diff) | |
| download | libgphoto2-f19c373aaef9d0edee1c08d34edf2d535dff2141.tar.gz | |
initialize the wait_for_event state during capture,
so we get the secondary image even on the first capture
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@15394 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/canon')
| -rw-r--r-- | camlibs/canon/usb.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/camlibs/canon/usb.c b/camlibs/canon/usb.c index ddc04565a..9682a26e7 100644 --- a/camlibs/canon/usb.c +++ b/camlibs/canon/usb.c @@ -1026,6 +1026,13 @@ canon_usb_capture_dialogue (Camera *camera, unsigned int *return_length, int *ph if (return_length) *return_length = 0; + /* for later wait_event */ + if (!camera->pl->directory_state) { + unsigned int directory_state_len; + + status = canon_usb_list_all_dirs ( camera, &camera->pl->directory_state, &directory_state_len, context ); + } + GP_DEBUG ("canon_usb_capture_dialogue()"); *photo_status = 0; /* This should only be checked by the caller |