From 7d1c712c09d93e382b3946130927f26c34ad799f Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Fri, 7 Oct 2011 07:51:55 +0000 Subject: [PATCH] Avoided to release drive prematurely if interrupted while grabbing drive --- cdrskin/cdrskin_timestamp.h | 2 +- libburn/drive.c | 5 ++--- libburn/drive.h | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/cdrskin/cdrskin_timestamp.h b/cdrskin/cdrskin_timestamp.h index 4126b4a..26cc847 100644 --- a/cdrskin/cdrskin_timestamp.h +++ b/cdrskin/cdrskin_timestamp.h @@ -1 +1 @@ -#define Cdrskin_timestamP "2011.10.06.121140" +#define Cdrskin_timestamP "2011.10.07.075117" diff --git a/libburn/drive.c b/libburn/drive.c index b2118ae..1cd4956 100644 --- a/libburn/drive.c +++ b/libburn/drive.c @@ -497,7 +497,6 @@ int burn_drive_grab(struct burn_drive *d, int le) d->status = BURN_DISC_UNREADY; errcode = d->grab(d); - if (errcode == 0) { burn_print(1, "low level drive grab failed\n"); return 0; @@ -1357,7 +1356,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 */; @@ -2332,7 +2331,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/drive.h b/libburn/drive.h index d1fa251..fa6674f 100644 --- a/libburn/drive.h +++ b/libburn/drive.h @@ -1,7 +1,7 @@ /* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */ /* Copyright (c) 2004 - 2006 Derek Foreman, Ben Jansens - Copyright (c) 2006 - 2010 Thomas Schmitt + Copyright (c) 2006 - 2011 Thomas Schmitt Provided under GPL version 2 or later. */