From c2513de0a2f1218fd2fca201293b986f3af97436 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Thu, 19 May 2011 13:37:16 +0000 Subject: [PATCH] Bug fix: The attempt to blank already blanked DVD-RW was not gracefully blocked --- libisoburn/trunk/xorriso/write_run.c | 12 ++++++++---- libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/libisoburn/trunk/xorriso/write_run.c b/libisoburn/trunk/xorriso/write_run.c index 99c0534d..d9473b5f 100644 --- a/libisoburn/trunk/xorriso/write_run.c +++ b/libisoburn/trunk/xorriso/write_run.c @@ -1304,10 +1304,14 @@ int Xorriso_blank_media(struct XorrisO *xorriso, int flag) Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "HINT", 0); flag&= ~1; } - } else if(disc_state == BURN_DISC_BLANK) { - sprintf(xorriso->info_text,"Blank media detected. Will leave it untouched"); - Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "NOTE", 0); - return 2; + } + if(disc_state == BURN_DISC_BLANK) { + if(!do_deformat) { + sprintf(xorriso->info_text, + "Blank media detected. Will leave it untouched"); + Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "NOTE", 0); + return 2; + } } else if(disc_state==BURN_DISC_FULL || disc_state==BURN_DISC_APPENDABLE) { ; } else if(disc_state == BURN_DISC_EMPTY) { diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index 85f84f1a..f3590223 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2011.05.19.111229" +#define Xorriso_timestamP "2011.05.19.133735"