From 9781f959ca6d14c7f551df2abd773b230326031a Mon Sep 17 00:00:00 2001 From: dynaflash Date: Fri, 12 Feb 2010 18:07:34 +0000 Subject: [PATCH] MacGui: Fix package default name types broken when batch scanning was introduced. - eg., .eyetv scans now produce a proper default output file name. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3116 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- macosx/Controller.m | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/macosx/Controller.m b/macosx/Controller.m index 013de2598..8c0df1394 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -4465,19 +4465,17 @@ bool one_burned = FALSE; hb_title_t * title = (hb_title_t*) hb_list_item( list, [fSrcTitlePopUp indexOfSelectedItem] ); - /* If we are a stream type, grok the output file name from title->name upon title change */ - if (title->type == HB_STREAM_TYPE) + /* If we are a stream type and a batch scan, grok the output file name from title->name upon title change */ + if (title->type == HB_STREAM_TYPE && hb_list_count( list ) > 1 ) { /* we set the default name according to the new title->name */ [fDstFile2Field setStringValue: [NSString stringWithFormat: @"%@/%@.%@", [[fDstFile2Field stringValue] stringByDeletingLastPathComponent], [NSString stringWithUTF8String: title->name], [[fDstFile2Field stringValue] pathExtension]]]; - /* If we have more than one title and are stream then we have a batch, change the source to read out the parent folder also */ - if ( hb_list_count( list ) > 1 ) - { - [fSrcDVD2Field setStringValue:[NSString stringWithFormat:@"%@/%@", browsedSourceDisplayName,[NSString stringWithUTF8String: title->name]]]; - } + + /* Change the source to read out the parent folder also */ + [fSrcDVD2Field setStringValue:[NSString stringWithFormat:@"%@/%@", browsedSourceDisplayName,[NSString stringWithUTF8String: title->name]]]; } /* For point a to point b pts encoding, set the start and end fields to 0 and the title duration in seconds respectively */ -- 2.40.0