From 4b86d29b592a4b3111373f12df7f0b5d9d161241 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Tue, 27 Aug 2013 09:54:13 +0000 Subject: [PATCH] Avoiding a futile re-try when ending after a failed session write attempt --- libisoburn/trunk/xorriso/write_run.c | 2 ++ libisoburn/trunk/xorriso/xorriso_private.h | 5 ++++- libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libisoburn/trunk/xorriso/write_run.c b/libisoburn/trunk/xorriso/write_run.c index 4b3ab1f0..95343506 100644 --- a/libisoburn/trunk/xorriso/write_run.c +++ b/libisoburn/trunk/xorriso/write_run.c @@ -1194,6 +1194,8 @@ ex:; /* >>> ??? revive discarded boot image */; + /* suppress automatic -commit at program end */ + xorriso->volset_change_pending= 3; } if(disc!=NULL) burn_disc_free(disc); diff --git a/libisoburn/trunk/xorriso/xorriso_private.h b/libisoburn/trunk/xorriso/xorriso_private.h index 0e83563a..efb155b9 100644 --- a/libisoburn/trunk/xorriso/xorriso_private.h +++ b/libisoburn/trunk/xorriso/xorriso_private.h @@ -309,9 +309,12 @@ struct XorrisO { /* the global context of xorriso */ loaded image. */ int volset_change_pending; /* whether -commit would make sense - 0= no change pending , 1= change pending + 0= no change pending + 1= change pending 2= change pending, but -as misofs -print-size was performed on the changed image model + 3= change pending, but the attempt to write it + failed */ int no_volset_present; /* set to 1 on first failure */ diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index 9a3ac703..93bc9662 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2013.08.20.144306" +#define Xorriso_timestamP "2013.08.27.095314"