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

Counting -volid as pending change only if the text really changed

This commit is contained in:
Thomas Schmitt 2015-04-23 14:24:49 +00:00
parent 4a511b73a8
commit 777863df2e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xorriso/iso_img.c
View File

@ -336,9 +336,11 @@ int Xorriso_set_volid(struct XorrisO *xorriso, char *volid, int flag)
ret= Xorriso_get_volume(xorriso, &volume, 0); ret= Xorriso_get_volume(xorriso, &volume, 0);
if(ret<=0) if(ret<=0)
return(ret); return(ret);
if(iso_image_get_volume_id(volume) == NULL ||
strcmp(iso_image_get_volume_id(volume), volid) != 0)
if(!(flag&1))
Xorriso_set_change_pending(xorriso, 1);
iso_image_set_volume_id(volume, volid); iso_image_set_volume_id(volume, volid);
if(!(flag&1))
Xorriso_set_change_pending(xorriso, 1);
Xorriso_process_msg_queues(xorriso,0); Xorriso_process_msg_queues(xorriso,0);
sprintf(xorriso->info_text,"Volume ID: '%s'",iso_image_get_volume_id(volume)); sprintf(xorriso->info_text,"Volume ID: '%s'",iso_image_get_volume_id(volume));
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "DEBUG", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "DEBUG", 0);

2
xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2015.04.23.142257" #define Xorriso_timestamP "2015.04.23.142407"