# HG changeset patch
# User nicodvb
# Date 1275386493 0
# Node ID d16ee5945580349b816535b156a66725e9cf0b5b
# Parent  1ce807c12563ae5e29a1ef42de1b428c2c135a16
Prevent display of garbage volume label when the file being scanned is
not a dvd. This is a simple movement of the code that logs the volume
name to after the point that some basic validation of the disc has been
performed.

Patch by John Stebbins of Handbrake

diff -r 1ce807c12563 -r d16ee5945580 vm/vm.c
--- a/vm/vm.c	Tue Jun 01 08:17:15 2010 +0000
+++ b/vm/vm.c	Tue Jun 01 10:01:33 2010 +0000
@@ -358,8 +358,6 @@
       fprintf(MSG_OUT, "libdvdnav: vm: failed to open/read the DVD\n");
       return 0;
     }
-    dvd_read_name(vm->dvd_name, vm->dvd_serial, dvdroot);
-    vm->map  = remap_loadmap(vm->dvd_name);
     vm->vmgi = ifoOpenVMGI(vm->dvd);
     if(!vm->vmgi) {
       fprintf(MSG_OUT, "libdvdnav: vm: failed to read VIDEO_TS.IFO\n");
@@ -390,6 +388,8 @@
       /* return 0; Not really used for now.. */
     }
     /* ifoRead_TXTDT_MGI(vmgi); Not implemented yet */
+    dvd_read_name(vm->dvd_name, vm->dvd_serial, dvdroot);
+    vm->map  = remap_loadmap(vm->dvd_name);
   }
   if (vm->vmgi) {
     int i, mask;