From 36049695087649c79e99ba9696895d5a6a6d50c1 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Fri, 15 Jun 2012 08:56:38 +0000 Subject: [PATCH] Provisorily banned the combination of -hfsplus and ISO image growing --- libisoburn/trunk/xorriso/write_run.c | 12 ++++++++++++ libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/libisoburn/trunk/xorriso/write_run.c b/libisoburn/trunk/xorriso/write_run.c index be3b5d4e..14e2f398 100644 --- a/libisoburn/trunk/xorriso/write_run.c +++ b/libisoburn/trunk/xorriso/write_run.c @@ -652,6 +652,18 @@ int Xorriso_write_session(struct XorrisO *xorriso, int flag) } s= isoburn_disc_get_status(drive); + if (xorriso->do_hfsplus && ( + (xorriso->grow_blindly_msc2 >= 0 && + xorriso->out_drive_handle != xorriso->in_drive_handle) + || + (xorriso->out_drive_handle == xorriso->in_drive_handle && + s != BURN_DISC_BLANK) + )) { + sprintf(xorriso->info_text, + "May not grow ISO image while -hfsplus is enabled"); + Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0); + {ret= 0; goto ex;} + } if(xorriso->out_drive_handle == xorriso->in_drive_handle) { if(abs(xorriso->displacement_sign) == 1 && xorriso->displacement != 0 && s != BURN_DISC_BLANK) { diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index 92c3ef15..4563fbbe 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2012.06.14.142958" +#define Xorriso_timestamP "2012.06.15.085732"