libburnia/legacy
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added necessary isoburn_cancel_prepared_write() calls

Browse Source
This commit is contained in:
Thomas Schmitt 2010-10-29 16:45:20 +00:00
parent 1d86a0be2f
commit c3d5065d43
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libisoburn/trunk/xorriso/write_run.c
View File

@ -844,7 +844,7 @@ int Xorriso_write_session(struct XorrisO *xorriso, int flag)
ret= Xorriso_make_write_options(xorriso, drive, &burn_options, 0); ret= Xorriso_make_write_options(xorriso, drive, &burn_options, 0);
if(ret<=0) if(ret<=0)
goto ex; goto cancel_iso;
isoburn_igopt_get_effective_lba(sopts, &(xorriso->session_lba)); isoburn_igopt_get_effective_lba(sopts, &(xorriso->session_lba));
if(xorriso->do_stream_recording == 2) { if(xorriso->do_stream_recording == 2) {
ret= isoburn_igopt_get_data_start(sopts, &data_lba); 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); Xorriso_process_msg_queues(xorriso,0);
if(flag&1) /* set queue severity to FAILURE */ if(flag&1) /* set queue severity to FAILURE */
Xorriso_set_image_severities(xorriso, 2); Xorriso_set_image_severities(xorriso, 2);
isoburn_cancel_prepared_write(source_drive, drive, 0);
if(flag&1) /* reset queue severity */ if(flag&1) /* reset queue severity */
Xorriso_set_image_severities(xorriso, 0); Xorriso_set_image_severities(xorriso, 0);
goto ex; goto cancel_iso;
} }
ret= Xorriso_may_burn(xorriso, 0); ret= Xorriso_may_burn(xorriso, 0);
if(ret <= 0) if(ret <= 0)
goto ex; goto cancel_iso;
/* Important: do not return until burn_is_aborting() was checked */ /* Important: do not return until burn_is_aborting() was checked */
Xorriso_set_signal_handling(xorriso, 1); Xorriso_set_signal_handling(xorriso, 1);
@ -939,6 +938,10 @@ ex:;
Xorriso_process_msg_queues(xorriso,0); Xorriso_process_msg_queues(xorriso,0);
Xorriso_append_scdbackup_record(xorriso, 0); Xorriso_append_scdbackup_record(xorriso, 0);
return(ret); return(ret);
cancel_iso:;
isoburn_cancel_prepared_write(source_drive, drive, 0);
goto ex;
} }

2
libisoburn/trunk/xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2010.10.27.063705" #define Xorriso_timestamP "2010.10.29.164503"