From bfb798b51b9cbfc67d9674733860dccb048ebbfc Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Wed, 25 Jan 2012 09:26:55 +0000 Subject: [PATCH] Removed overdone part of rev 4593 --- cdrskin/cdrskin.c | 8 +------- cdrskin/cdrskin_timestamp.h | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/cdrskin/cdrskin.c b/cdrskin/cdrskin.c index f7a0eaa..b103f5e 100644 --- a/cdrskin/cdrskin.c +++ b/cdrskin/cdrskin.c @@ -3505,7 +3505,6 @@ struct CdrskiN { 0= no: directly call burn_abort 1= yes: A worker thread is busy (e.g. writing, formatting) 2= yes: A synchronous operation is busy (e.g. grabbing). - Do not wait but return -2. */ int drive_is_busy; @@ -4168,14 +4167,9 @@ int Cdrskin_abort_handler(struct CdrskiN *skin, int signum, int flag) } Cdrskin_abort_leveL= -1; - if(skin->drive_is_busy == 2 || drive_status == BURN_DRIVE_GRABBING) { - if(skin->grabbed_drive != NULL) - burn_drive_cancel(skin->grabbed_drive); - return(-2); - } if (!(flag & 1)) { if(skin->verbosity>=Cdrskin_verbose_debuG) - ClN(fprintf(stderr,"cdrskin_debug: ABORT : Calling burn_abort()\n")); + ClN(fprintf(stderr,"cdrskin: ABORT : Calling burn_abort(-1)\n")); burn_abort(-1, burn_abort_pacifier, "cdrskin: "); } fprintf(stderr, diff --git a/cdrskin/cdrskin_timestamp.h b/cdrskin/cdrskin_timestamp.h index 5be7f2a..7fcdae1 100644 --- a/cdrskin/cdrskin_timestamp.h +++ b/cdrskin/cdrskin_timestamp.h @@ -1 +1 @@ -#define Cdrskin_timestamP "2012.01.23.164346" +#define Cdrskin_timestamP "2012.01.25.092650"