diff --git a/libburn/trunk/cdrskin/cdrskin_timestamp.h b/libburn/trunk/cdrskin/cdrskin_timestamp.h index 61d7fa78..df7ea668 100644 --- a/libburn/trunk/cdrskin/cdrskin_timestamp.h +++ b/libburn/trunk/cdrskin/cdrskin_timestamp.h @@ -1 +1 @@ -#define Cdrskin_timestamP "2011.11.30.131608" +#define Cdrskin_timestamP "2011.12.02.100148" diff --git a/libburn/trunk/libburn/drive.c b/libburn/trunk/libburn/drive.c index 4323f107..0b016b04 100644 --- a/libburn/trunk/libburn/drive.c +++ b/libburn/trunk/libburn/drive.c @@ -1341,7 +1341,7 @@ int burn_drive_forget(struct burn_drive *d, int force) if(occup > 0) if(force < 1) return 0; - if(occup >= 10) + if(occup > 10) return 0; /* >>> do any drive calming here */; @@ -2317,7 +2317,7 @@ int burn_abort_5(int patience, } - if(occup < 10) { + if(occup <= 10) { if (drive_array[i].drive_role != 1) /* occup == -1 comes early */ usleep(1000000); diff --git a/libburn/trunk/libburn/spc.c b/libburn/trunk/libburn/spc.c index 87499bcc..8a53a694 100644 --- a/libburn/trunk/libburn/spc.c +++ b/libburn/trunk/libburn/spc.c @@ -210,6 +210,8 @@ handle_error:; goto handle_error; slumber:; + if (d->cancel) + break; usleep(sleep_usecs); } if (ret <= 0 || !(flag & 2)) {