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

[sylvain cresto]

Index: graveman/current/src/cdrdao.c
diff -u graveman/current/src/cdrdao.c:1.10 graveman/current/src/cdrdao.c:1.11
--- graveman/current/src/cdrdao.c:1.10  Tue Mar 29 00:10:26 2005
+++ graveman/current/src/cdrdao.c       Thu Mar 31 22:14:12 2005
@@ -115,10 +115,9 @@
      /* copie en cours */
 
     if (strstr(f, CDRDAO_BLOCKS)) {
-      /* fin de l'operation */
+      /* fin de l'operation */      
       gtk_label_set_text(Ltitle, _("Finishing operation..."));
     } else {
-//      gchar *Lde = NULL, *La = NULL;
       gdouble Lgbuf = 0, Lfifo = 0;
       gdouble Lde = 0, La = 0;
       gboolean Lok = FALSE;
@@ -482,8 +481,11 @@
   gint Lloccont = 2;
   gint *Lpid = (gint *)sc_grave_get_data(Ag, "pid");
   GString *Loutput;
+  gchar *Lcdprg = conf_get_string("cdrdao");
 
-  g_snprintf(Lcommandline, sizeof(Lcommandline)-1, "%s disk-info --device %s", 
conf_get_string("cdrdao"), DRIVE_DEV(Adevice));
+  if (!Lcdprg || !*Lcdprg) return 0;
+
+  g_snprintf(Lcommandline, sizeof(Lcommandline)-1, "%s disk-info --device %s", 
Lcdprg, DRIVE_DEV(Adevice));
 _DEB("execution de [%s]\n", Lcommandline);
   if (!g_shell_parse_argv(Lcommandline, &Lnbrarg, &Lcmd, Aerror)) return 0;