summaryrefslogtreecommitdiff
path: root/camlibs/canon
diff options
context:
space:
mode:
authorMarcus Meissner <marcus@jet.franken.de>2016-02-11 19:19:13 +0100
committerMarcus Meissner <marcus@jet.franken.de>2016-02-11 19:19:13 +0100
commit79c79fe0c510e75d5e85c42e4ef4d2749be76263 (patch)
treec3359d57e1d2b53130b634d631746af94619b94a /camlibs/canon
parent9b7acffc1f48935d74c9d1601bf0d6bde84523d6 (diff)
downloadlibgphoto2-79c79fe0c510e75d5e85c42e4ef4d2749be76263.tar.gz
keep the final post-capture directory state for later wait-events
Diffstat (limited to 'camlibs/canon')
-rw-r--r--camlibs/canon/canon.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/camlibs/canon/canon.c b/camlibs/canon/canon.c
index 5145f8c2f..6ab65b7b2 100644
--- a/camlibs/canon/canon.c
+++ b/camlibs/canon/canon.c
@@ -1638,8 +1638,13 @@ canon_int_capture_image (Camera *camera, CameraFilePath *path,
/* Find new file name in camera directory */
canon_int_find_new_image ( camera, initial_state, final_state, path );
+
+ /* Save this state to the camera directory state */
+ if (camera->pl->directory_state)
+ free (camera->pl->directory_state);
+ camera->pl->directory_state = final_state;
+
free ( initial_state );
- free ( final_state );
break;
case GP_PORT_SERIAL:
return GP_ERROR_NOT_SUPPORTED;