From c3d5065d43587118e71a697f0de2a01d58504cdf Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Fri, 29 Oct 2010 16:45:20 +0000
Subject: [PATCH] Added necessary isoburn_cancel_prepared_write() calls

---
 libisoburn/trunk/xorriso/write_run.c         | 11 +++++++----
 libisoburn/trunk/xorriso/xorriso_timestamp.h |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/libisoburn/trunk/xorriso/write_run.c b/libisoburn/trunk/xorriso/write_run.c
index a7ce8334..5ea88ce8 100644
--- a/libisoburn/trunk/xorriso/write_run.c
+++ b/libisoburn/trunk/xorriso/write_run.c
@@ -844,7 +844,7 @@ int Xorriso_write_session(struct XorrisO *xorriso, int flag)
 
  ret= Xorriso_make_write_options(xorriso, drive, &burn_options, 0);
  if(ret<=0)
-   goto ex;
+   goto cancel_iso;
  isoburn_igopt_get_effective_lba(sopts, &(xorriso->session_lba));
  if(xorriso->do_stream_recording == 2) {
    ret= isoburn_igopt_get_data_start(sopts, &data_lba);
@@ -857,15 +857,14 @@ int Xorriso_write_session(struct XorrisO *xorriso, int flag)
    Xorriso_process_msg_queues(xorriso,0);
    if(flag&1) /* set queue severity to FAILURE */
      Xorriso_set_image_severities(xorriso, 2);
-   isoburn_cancel_prepared_write(source_drive, drive, 0);
    if(flag&1) /* reset queue severity */
      Xorriso_set_image_severities(xorriso, 0);
-   goto ex;
+   goto cancel_iso;
  }
 
  ret= Xorriso_may_burn(xorriso, 0);
  if(ret <= 0)
-   goto ex;
+   goto cancel_iso;
 
  /* Important: do not return until burn_is_aborting() was checked */
  Xorriso_set_signal_handling(xorriso, 1);
@@ -939,6 +938,10 @@ ex:;
  Xorriso_process_msg_queues(xorriso,0);
  Xorriso_append_scdbackup_record(xorriso, 0);
  return(ret);
+
+cancel_iso:;
+ isoburn_cancel_prepared_write(source_drive, drive, 0);
+ goto ex;
 } 
 
 
diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h
index 2e480bd4..7d4af9e1 100644
--- a/libisoburn/trunk/xorriso/xorriso_timestamp.h
+++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2010.10.27.063705"
+#define Xorriso_timestamP "2010.10.29.164503"