From 7a7232f16eeb9a2c427d1e7b037d4fa9afa655cb Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Mon, 7 Jul 2008 15:02:02 +0000
Subject: [PATCH] Correction about -as mkisofs -C if already an input device
 was set

---
 xorriso/xorriso.c           | 8 +++++++-
 xorriso/xorriso_timestamp.h | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/xorriso/xorriso.c b/xorriso/xorriso.c
index f9de87ce..a4d14a55 100644
--- a/xorriso/xorriso.c
+++ b/xorriso/xorriso.c
@@ -7615,6 +7615,12 @@ illegal_c:;
    sfe[cpt-msc]= 0;
    if(strcmp(sfe, "16")==0) /* growisofs uses 16 to avoid a bug in mkisofs */
      strcpy(sfe, "0");
+   if(indev[0]) {
+     /* give up indev before setting the load address */
+     ret= Xorriso_option_dev(xorriso, "", 1);
+     if(ret<=0)
+       return(ret);
+   }
    ret= Xorriso_option_load(xorriso, "sbsector", sfe, 0);
    if(ret<=0)
      return(ret);
@@ -9173,7 +9179,7 @@ int Xorriso_option_dev(struct XorrisO *xorriso, char *in_adr, int flag)
    Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
    return(0);
  }
- if((flag&1) && !(flag&4)) {
+ if((flag&1) && (xorriso->in_drive_handle != NULL || adr[0]) && !(flag&4)) {
    ret= Xorriso_reassure(xorriso, (flag&2) ? "-dev" : "-indev",
                          "eventually discard the current image", 0);
    if(ret<=0)
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index d824c1a8..6e0bc268 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2008.07.07.102941"
+#define Xorriso_timestamP "2008.07.07.150241"