From 38ae38d582c9c658c3161af229c08f515b48303f Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Sun, 19 Sep 2010 06:46:25 +0000 Subject: [PATCH] Fixed a bug with uninitialized variable introduced by rev 3364 --- libisoburn/branches/ZeroSixTwo/libisoburn/isoburn.c | 5 ++--- libisoburn/branches/ZeroSixTwo/xorriso/xorriso_timestamp.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libisoburn/branches/ZeroSixTwo/libisoburn/isoburn.c b/libisoburn/branches/ZeroSixTwo/libisoburn/isoburn.c index 5bc40549..ddea8e34 100644 --- a/libisoburn/branches/ZeroSixTwo/libisoburn/isoburn.c +++ b/libisoburn/branches/ZeroSixTwo/libisoburn/isoburn.c @@ -500,9 +500,6 @@ int isoburn_prepare_disc_aux(struct burn_drive *in_d, struct burn_drive *out_d, ret= isoburn_adjust_target_iso_head(out_o, opts->partition_offset, 0); if(ret <= 0) {ret= -1; goto ex;} - iso_write_opts_set_overwrite_buf(wopts, - nwa>0 ? out_o->target_iso_head : NULL); - if(opts->no_emul_toc) { if(out_o->nwa == out_o->zero_nwa && out_o->zero_nwa == Libisoburn_overwriteable_starT @@ -523,6 +520,8 @@ int isoburn_prepare_disc_aux(struct burn_drive *in_d, struct burn_drive *out_d, } iso_write_opts_set_ms_block(wopts, nwa); iso_write_opts_set_appendable(wopts, !new_img); + iso_write_opts_set_overwrite_buf(wopts, + nwa>0 ? out_o->target_iso_head : NULL); iso_write_opts_set_part_offset(wopts, opts->partition_offset, opts->partition_secs_per_head, opts->partition_heads_per_cyl); diff --git a/libisoburn/branches/ZeroSixTwo/xorriso/xorriso_timestamp.h b/libisoburn/branches/ZeroSixTwo/xorriso/xorriso_timestamp.h index 073a4e28..a4aedc3f 100644 --- a/libisoburn/branches/ZeroSixTwo/xorriso/xorriso_timestamp.h +++ b/libisoburn/branches/ZeroSixTwo/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2010.09.18.120001" +#define Xorriso_timestamP "2010.09.18.210001"