@@@ dvdrip-upload: change settings while i'm stealing someone else's internet

[dvdrip] / dvd-id.c

diff --git a/dvd-id.c b/dvd-id.c
index 72059b9..496b6bb 100644 (file)
--- a/dvd-id.c
+++ b/dvd-id.c
@@ -8,7 +8,7 @@ int main(int argc, char *argv[])
   char id[MAXIDSZ];
   int i, opt, st = 0;
   unsigned f = 0, dif = 0;
-  static dvd_reader_t *dvd;
+  static dvd_reader_t *dvd = 0;
 #define f_bogus 1u
 
   set_prog(argv[0]);
@@ -27,14 +27,14 @@ int main(int argc, char *argv[])
   progress_init(&progress);
 
   for (i = optind; i < argc; i++) {
-    open_dvd(argv[i], O_RDONLY, 0, &dvd);
-    if (dvd_id(id, dvd, dif, argv[i]))
+    if (open_dvd(argv[i], O_RDONLY, 0, &dvd) ||
+       dvd_id(id, dvd, dif, argv[i]))
       st = 2;
     else {
       if (argc - optind > 1) printf("%s: ", argv[i]);
       printf("%s\n", id);
     }
-    DVDClose(dvd);
+    DVDClose(dvd); dvd = 0;
   }
 
   progress_free(&progress);