MacGui: fixed a issue that happened on 10.8 when reloading a job from the queue:...

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6496 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/macosx/HBSubtitlesController.h b/macosx/HBSubtitlesController.h
index 013074cf0e563236ab9acc9b2e3922189deb1f7f..dd41d1d81ee011cb209c7d34c24df44f58003bb8 100644 (file)
--- a/macosx/HBSubtitlesController.h
+++ b/macosx/HBSubtitlesController.h
@@ -29,7 +29,7 @@ extern NSString *keySubTrackSrtCharCode;
  */
 @interface HBSubtitlesController : NSViewController <HBViewValidation>
 
-- (void)addTracksFromQueue:(NSMutableArray *)newSubtitleArray;
+- (void)addTracksFromQueue:(NSArray *)queueSubtitleArray;
 
 - (void)applySettingsFromPreset:(NSDictionary *)preset;
 

diff --git a/macosx/HBSubtitlesController.m b/macosx/HBSubtitlesController.m
index 91ed94c8de591c2c6da2abb2778f1188f2ae3abe..4882cc84b9cabd8d1811978241c4f752f33dcffd 100644 (file)
--- a/macosx/HBSubtitlesController.m
+++ b/macosx/HBSubtitlesController.m
@@ -192,13 +192,13 @@ NSString *keySubTrackLanguageIndex = @"keySubTrackLanguageIndex";
     return [ret autorelease];
 }
 
-- (void)addTracksFromQueue:(NSMutableArray *)newSubtitleArray
+- (void)addTracksFromQueue:(NSArray *)queueSubtitleArray
 {
     /* Note: we need to look for external subtitles so it can be added to the source array track.
      * Remember the source container subs are already loaded with resetTitle which is already called
      * so any external sub sources need to be added to our source subs here
      */
-    for (id tempObject in newSubtitleArray)
+    for (id tempObject in queueSubtitleArray)
     {
         /* We have an srt track */
         if ([tempObject[keySubTrackType] intValue] == SRTSUB)
@@ -212,10 +212,9 @@ NSString *keySubTrackLanguageIndex = @"keySubTrackLanguageIndex";
         }
     }
 
-    [newSubtitleArray addObject:[self createSubtitleTrack]];
-
     // Set the subtitleArray to the newSubtitleArray
-    [self.subtitleArray setArray:newSubtitleArray];
+    [self.subtitleArray setArray:queueSubtitleArray];
+    [self.subtitleArray addObject:[self createSubtitleTrack]];
     [self.fTableView reloadData];
 }