Mapping in burn runs -abort_on MISHAP to SORRY

This commit is contained in:
Thomas Schmitt 2008-02-11 21:40:01 +00:00
parent 1f0ea7f226
commit a1c8a7438a
2 changed files with 8 additions and 2 deletions

View File

@ -1 +1 @@
#define Xorriso_timestamP "2008.02.11.194807" #define Xorriso_timestamP "2008.02.11.213918"

View File

@ -830,6 +830,7 @@ int Xorriso_write_session(struct XorrisO *xorriso, int flag)
sopts.fifo_size= xorriso->fs * 2048; sopts.fifo_size= xorriso->fs * 2048;
#endif /* NIX */ #endif /* NIX */
Xorriso_set_abort_severity(xorriso, 1);
if(xorriso->out_drive_handle == xorriso->in_drive_handle || if(xorriso->out_drive_handle == xorriso->in_drive_handle ||
xorriso->in_drive_handle == NULL) { xorriso->in_drive_handle == NULL) {
ret= isoburn_prepare_disc(source_drive, &disc, sopts); ret= isoburn_prepare_disc(source_drive, &disc, sopts);
@ -940,6 +941,7 @@ no_track:;
ret= 1; ret= 1;
ex:; ex:;
xorriso->run_state= 0; /* Indicate that burning has ended */ xorriso->run_state= 0; /* Indicate that burning has ended */
Xorriso_set_abort_severity(xorriso, 0);
if(ret<=0) { if(ret<=0) {
/* >>> ??? revive discarded boot image */; /* >>> ??? revive discarded boot image */;
@ -3617,11 +3619,15 @@ int Xorriso_get_volid(struct XorrisO *xorriso, char volid[33], int flag)
} }
/* @param flag bit0=prepare for a burn run */
int Xorriso_set_abort_severity(struct XorrisO *xorriso, int flag) int Xorriso_set_abort_severity(struct XorrisO *xorriso, int flag)
{ {
int ret; int ret;
ret= iso_set_abort_severity(xorriso->abort_on_text); if((flag&1) && strcmp(xorriso->abort_on_text, "MISHAP")==0)
ret= iso_set_abort_severity("SORRY");
else
ret= iso_set_abort_severity(xorriso->abort_on_text);
return(ret>=0); return(ret>=0);
} }