diff --git a/libisoburn/trunk/xorriso/xorriso.c b/libisoburn/trunk/xorriso/xorriso.c
index 9fbf9eeb..6564d317 100644
--- a/libisoburn/trunk/xorriso/xorriso.c
+++ b/libisoburn/trunk/xorriso/xorriso.c
@@ -12262,15 +12262,18 @@ return:
 
 next_command:;
  if(flag&2) {
+   ret= 1;
    if(xorriso->argument_emulation==1)
      ret= Xorriso_as_genisofs(xorriso, argc, argv, idx, 0);
    else if(xorriso->argument_emulation==2)
      ret= Xorriso_as_cdrskin(xorriso, argc, argv, idx, 0);
-   xorriso->argument_emulation= 0;
-   if(ret<=0)
-     goto eval_any_problems;
-   if((*idx)>=argc)
-     {ret= 1; goto ex;}
+   if(xorriso->argument_emulation>0) {
+     xorriso->argument_emulation= 0;
+     if(ret<=0)
+       goto eval_any_problems;
+     if((*idx)>=argc)
+       {ret= 1; goto ex;}
+   }
  }
 
  xorriso->prepended_wd= 0;
diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h
index 3faf0ed3..50fa843c 100644
--- a/libisoburn/trunk/xorriso/xorriso_timestamp.h
+++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2008.07.10.162809"
+#define Xorriso_timestamP "2008.07.10.164015"