From: dynaflash <dynaflash@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Date: Fri, 28 Sep 2007 13:38:15 +0000 (+0000)
Subject: MacGui: Fix issue where Source is display with the volume id (ie. disk1) instead... 
X-Git-Url: http://git.osdn.jp/view?a=commitdiff_plain;ds=sidebyside;h=b1274767d3dd529ff99fa779e5bf8bc26e8b0eac;p=handbrake-jp%2Fhandbrake-jp-git.git

MacGui: Fix issue where Source is display with the volume id (ie. disk1) instead of the volume name if source is a physical dvd. This bug was introduced pre 0.9.0 with the integrated source scan controller.

git-svn-id: svn://localhost/HandBrake/trunk@997 b64f7644-9d1e-0410-96f1-a4d463321fa5
---

diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index 63525db2..8bfe5d13 100644
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -1007,14 +1007,15 @@ static NSString *        ChooseSourceIdentifier             = @"Choose Source It
 		{
 			title = (hb_title_t *) hb_list_item( list, i );
 			
-            currentSource = [NSString stringWithUTF8String: title->dvd];
+            currentSource = [NSString stringWithUTF8String: title->name];
             
             /* To get the source name as well as the default output name, first we check to see if
                the selected directory is the VIDEO_TS Directory */
             if ([[currentSource lastPathComponent] isEqualToString: @"VIDEO_TS"])
             {
-            /* If VIDEO_TS Folder is chosen, choose its parent folder for the source display name */
-            sourceDisplayName = [NSString stringWithFormat:[[currentSource stringByDeletingLastPathComponent] lastPathComponent]];
+            /* If VIDEO_TS Folder is chosen, choose its parent folder for the source display name 
+               we have to use the title->dvd value so we get the proper name of the volume if a physical dvd is the source*/
+            sourceDisplayName = [NSString stringWithFormat:[[[NSString stringWithUTF8String: title->dvd] stringByDeletingLastPathComponent] lastPathComponent]];
             }
             else
             {