diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-08-13 16:32:28 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-08-13 16:32:28 +0200 |
commit | 0f67b3cc674377559e66c5a6729fd499049a992f (patch) | |
tree | db385afa84c09891e9a83c18b6e5436cf6e983ed /src/camera/GPhoto.vala | |
parent | f8ca421bdacee8851965a4b802ada1d2366bdbc1 (diff) | |
parent | 6cee6189adf46287667c35707325dd0820ea9f33 (diff) |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/camera/GPhoto.vala')
-rw-r--r-- | src/camera/GPhoto.vala | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/camera/GPhoto.vala b/src/camera/GPhoto.vala index 5acc4a3..5919080 100644 --- a/src/camera/GPhoto.vala +++ b/src/camera/GPhoto.vala @@ -205,18 +205,14 @@ namespace GPhoto { GPhoto.CameraFile camera_file; GPhoto.Result res = GPhoto.CameraFile.create_from_fd(out camera_file, fd); if (res != Result.OK) { - Posix.close(fd); throw new GPhotoError.LIBRARY("[%d] Error allocating camera file: %s", (int) res, res.as_string()); } res = camera.get_file(folder, filename, GPhoto.CameraFileType.NORMAL, camera_file, context); if (res != Result.OK) { - Posix.close(fd); throw new GPhotoError.LIBRARY("[%d] Error retrieving file object for %s/%s: %s", (int) res, folder, filename, res.as_string()); } - - Posix.close(fd); } public PhotoMetadata? load_metadata(Context context, Camera camera, string folder, string filename) |