From fe67d3ffe680c103a208743080649103ccbfb4dc Mon Sep 17 00:00:00 2001 From: Gus Hartmann Date: Tue, 31 Oct 2000 06:55:32 +0000 Subject: [PATCH] Fixed the sanity check on card_status before deleting an image. Images can now be deleted again. git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@1296 67ed7778-7388-44ab-90cf-0a291f65f57c --- camlibs/minolta/dimagev/delete.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/camlibs/minolta/dimagev/delete.c b/camlibs/minolta/dimagev/delete.c index 9ec597758..f0f605734 100644 --- a/camlibs/minolta/dimagev/delete.c +++ b/camlibs/minolta/dimagev/delete.c @@ -32,14 +32,14 @@ int dimagev_delete_picture(dimagev_t *dimagev, int file_number) { return GP_ERROR; } + dimagev_dump_camera_status(dimagev->status); /* An image can only be deleted if the card is normal or full. */ - if (( dimagev->status->card_status != 0 ) || ( dimagev->status->card_status != 1 )) { + if ( dimagev->status->card_status > 1 ) { if ( dimagev->debug != 0 ) { gp_debug_printf(GP_DEBUG_HIGH, "dimagev", "dimagev_delete_picture::memory card does not permit deletion"); } return GP_ERROR; } - if ( dimagev->data->host_mode != 1 ) {