summaryrefslogtreecommitdiffstats
path: root/macosx
diff options
context:
space:
mode:
authordynaflash <[email protected]>2009-12-10 19:31:01 +0000
committerdynaflash <[email protected]>2009-12-10 19:31:01 +0000
commitc19dbbdb0d3374a2abda3a08ffccf5a9c26148e9 (patch)
tree1c8e7489b30e0e930e785e68c0a442530e954850 /macosx
parentf6986e59735724f22f37646693a22c2fe650ecff (diff)
MacGui: Fix issue with subtitle changes affecting all encodes in the queue by being less stupid.
- Thanks to Rodeo for bringing it to my attention. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3024 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx')
-rw-r--r--macosx/Controller.m4
-rw-r--r--macosx/HBSubtitles.h2
-rw-r--r--macosx/HBSubtitles.m2
3 files changed, 4 insertions, 4 deletions
diff --git a/macosx/Controller.m b/macosx/Controller.m
index 62b9c380d..ec0bc9939 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -2286,8 +2286,8 @@ fWorkingCount = 0;
}
/* Subtitles*/
- NSMutableArray *subtitlesArray = [[NSMutableArray alloc] init];
- [queueFileJob setObject:[NSArray arrayWithArray: [fSubtitlesDelegate getSubtitleArray: subtitlesArray]] forKey:@"SubtitleList"];
+ NSMutableArray *subtitlesArray = [[NSMutableArray alloc] initWithArray:[fSubtitlesDelegate getSubtitleArray] copyItems:YES];
+ [queueFileJob setObject:[NSArray arrayWithArray: subtitlesArray] forKey:@"SubtitleList"];
[subtitlesArray autorelease];
/* Now we go ahead and set the "job->values in the plist for passing right to fQueueEncodeLibhb */
diff --git a/macosx/HBSubtitles.h b/macosx/HBSubtitles.h
index 6cc55356b..c8232d432 100644
--- a/macosx/HBSubtitles.h
+++ b/macosx/HBSubtitles.h
@@ -29,7 +29,7 @@ int container;
// Create new subtitle track
- (void)addSubtitleTrack;
- (NSDictionary *)createSubtitleTrack;
-- (NSMutableArray*) getSubtitleArray: (NSMutableArray *) subtitlesArray ;
+- (NSMutableArray*) getSubtitleArray;
// Add an srt file
- (void)createSubtitleSrtTrack:(NSString *)filePath;
diff --git a/macosx/HBSubtitles.m b/macosx/HBSubtitles.m
index 95ffad022..d0e959c27 100644
--- a/macosx/HBSubtitles.m
+++ b/macosx/HBSubtitles.m
@@ -426,7 +426,7 @@
}
-- (NSMutableArray*) getSubtitleArray: (NSMutableArray *) subtitlesArray
+- (NSMutableArray*) getSubtitleArray
{
return subtitleArray;
}