Moved call of iso_image_set_boot_catalog_hidden() to Xorriso_write_session()

xorriso/write_run.c

@@ -331,7 +331,7 @@ int Xorriso_attach_boot_image(struct XorrisO *xorriso, int flag)
  ElToritoBootImage *bootimg;
  enum eltorito_boot_media_type emul_type= ELTORITO_NO_EMUL;
  char *bin_path;
- int emul, platform_id, hide_attr;
+ int emul, platform_id;
  off_t load_size;
  struct stat stbuf;
  int hflag= 0;
@@ -437,17 +437,8 @@ int Xorriso_attach_boot_image(struct XorrisO *xorriso, int flag)
      iso_image_remove_boot_image(image);
    ret= iso_image_set_boot_image(image, bin_path, emul_type,
                                  xorriso->boot_image_cat_path, &bootimg);
-   if(ret > 0) {
+   if(ret > 0)
      iso_image_set_boot_catalog_weight(image, 1000000000);
-     if(xorriso->boot_image_cat_hidden) {
-       hide_attr= LIBISO_HIDE_BUT_WRITE;
-       if(xorriso->boot_image_cat_hidden & 1)
-         hide_attr|= LIBISO_HIDE_ON_RR;
-       if(xorriso->boot_image_cat_hidden & 2)
-         hide_attr|= LIBISO_HIDE_ON_JOLIET;
-       iso_image_set_boot_catalog_hidden(image, hide_attr);
-     }
-   }
  } else {
    ret= iso_image_add_boot_image(image, bin_path, emul_type, 0, &bootimg);
  }
@@ -496,7 +487,7 @@ ex:;
 int Xorriso_write_session(struct XorrisO *xorriso, int flag)
 {
  int ret, relax= 0, i, pacifier_speed= 0, data_lba, ext, is_bootable= 0;
- int major, minor, micro, freshly_bootable= 0;
+ int major, minor, micro, freshly_bootable= 0, hide_attr;
  char xorriso_id[256], *img_id, sfe[5*SfileadrL], *out_cs;
  struct isoburn_imgen_opts *sopts= NULL;
  struct burn_drive_info *dinfo, *source_dinfo;
@@ -614,6 +605,12 @@ int Xorriso_write_session(struct XorrisO *xorriso, int flag)
          }
        }
      }
+     hide_attr= !!(xorriso->boot_image_cat_hidden);
+     if(xorriso->boot_image_cat_hidden & 1)
+       hide_attr|= LIBISO_HIDE_ON_RR;
+     if(xorriso->boot_image_cat_hidden & 2)
+       hide_attr|= LIBISO_HIDE_ON_JOLIET;
+     iso_image_set_boot_catalog_hidden(image, hide_attr);
    } else if(xorriso->patch_isolinux_image & 1) {
      if(is_bootable == 1) {
        relax|= isoburn_igopt_allow_full_ascii;

xorriso/xorriso_timestamp.h

@@ -1 +1 @@
-#define Xorriso_timestamP "2010.06.23.175357"
+#define Xorriso_timestamP "2010.06.23.175613"