diff options
| author | Vince Weaver <vince@deater.net> | 2001-09-03 20:47:24 +0000 |
|---|---|---|
| committer | Vince Weaver <vince@deater.net> | 2001-09-03 20:47:24 +0000 |
| commit | 81f4c9d37d17c8eb1a0f390457098a2a18437202 (patch) | |
| tree | 0a348c09efd8e4d35753a8849666f388564c1af1 /libgphoto2/camera.c | |
| parent | 881991bd34b4b755214e78f05bc77537c5bcd1b3 (diff) | |
| download | libgphoto2-81f4c9d37d17c8eb1a0f390457098a2a18437202.tar.gz | |
Fix locking bug
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2182 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'libgphoto2/camera.c')
| -rw-r--r-- | libgphoto2/camera.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libgphoto2/camera.c b/libgphoto2/camera.c index bec2e83f2..7073819b0 100644 --- a/libgphoto2/camera.c +++ b/libgphoto2/camera.c @@ -699,7 +699,7 @@ gp_camera_file_get_info (Camera *camera, const char *folder, /* Get the preview */ info->preview.fields = GP_FILE_INFO_NONE; CHECK_RESULT (gp_file_new (&cfile)); - CHECK_OPEN (camera); +// CHECK_OPEN (camera); if (gp_camera_file_get (camera, folder, file, GP_FILE_TYPE_PREVIEW, cfile)== GP_OK) { info->preview.fields |= GP_FILE_INFO_SIZE | @@ -710,7 +710,7 @@ gp_camera_file_get_info (Camera *camera, const char *folder, strncpy (info->preview.type, mime_type, sizeof (info->preview.type)); } - CHECK_CLOSE (camera); +// CHECK_CLOSE (camera); CHECK_RESULT (gp_file_unref (cfile)); } else CHECK_RESULT_OPEN_CLOSE (camera, @@ -764,7 +764,7 @@ gp_camera_file_get (Camera *camera, const char *folder, const char *file, return (GP_ERROR_DIRECTORY_NOT_FOUND); if (strlen (file) == 0) return (GP_ERROR_FILE_NOT_FOUND); - + CHECK_OPEN (camera); result = gp_filesystem_get_file (camera->fs, folder, file, type, camera_file); |