[Graveman-cvs] Changes to graveman/current/src/mkisofs.c

[sylvain cresto]

Index: graveman/current/src/mkisofs.c
diff -u graveman/current/src/mkisofs.c:1.19 graveman/current/src/mkisofs.c:1.20
--- graveman/current/src/mkisofs.c:1.19 Thu Mar 31 22:14:12 2005
+++ graveman/current/src/mkisofs.c      Mon Apr  4 01:37:42 2005
@@ -71,26 +71,27 @@
   Ltmpappi = gtk_text_iter_get_text (&Lstart, &Lend);
   Ldataappi = g_strescape(Ltmpappi, "");
   g_free(Ltmpappi);
+  gchar *Ldevchar = NULL;
 
   if (!strcmp(Aop, "data")) { /* data cd */
     gboolean Lrockridge = 
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sc_grave_get_widget(Ag, 
"datarockridge")));
     gboolean Ljoliet = 
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sc_grave_get_widget(Ag, 
"datajoliet")));
     gchar *Lisolevel = get_combo_value(sc_grave_get_widget(Ag, 
"dataisolevel"));
     gchar *Lmediainfo = NULL;
-    gchar *Lcombo = NULL;
 
     if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sc_grave_get_widget(Ag, 
"datamulti")))) {
       gboolean *Luseautoblank = (gboolean *) sc_grave_get_data(Ag, 
"useautoblank");
 
       if (*Luseautoblank == FALSE) {
-        Lcombo = get_combo_value(sc_grave_get_widget(Ag, "dstdatacombo"));
-        Lmediainfo = cdrecord_get_mediainfo(Ag, Lcombo, NULL);
+        Tdriveinfo *Ldevice = get_drive_info(Ag, "dstdatacombo");
+        Lmediainfo = cdrecord_get_mediainfo(Ag, Ldevice, NULL);
+        Ldevchar = DRIVE_DEV(Ldevice);
       }
     }
 
     Lextra = g_strdup_printf("%s %s -iso-level %s %s%s %s%s", Lrockridge == 
TRUE ? "-r" : "", Ljoliet ? "-J" : "", Lisolevel,
-        Lmediainfo ? "-C " : "", Lmediainfo ? Lmediainfo : "", Lcombo && 
Lmediainfo ? "-M " : "",
-        Lcombo && Lmediainfo ? Lcombo : "");
+        Lmediainfo ? "-C " : "", Lmediainfo ? Lmediainfo : "", Lmediainfo && 
Ldevchar ? "-M " : "",
+        Lmediainfo && Ldevchar ? Ldevchar : "");
     g_free(Lmediainfo);
     g_free(Lisolevel);
   } else {  /* data dvd */