diff options
| author | ritsuka <[email protected]> | 2015-03-17 19:02:47 +0000 |
|---|---|---|
| committer | ritsuka <[email protected]> | 2015-03-17 19:02:47 +0000 |
| commit | b13dba524acb20dcb8533246563fb8ae7a2a1a33 (patch) | |
| tree | ce5a42a70d6e249e6c633f59565f3b48a5f17c9c /macosx | |
| parent | 86dd3051ef3e711d592b34851b8981d736001b81 (diff) | |
MacGui: fix a crash in the add preset and add titles to queue sheets introduced by the ARC conversion.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7000 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/HBController.m | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/macosx/HBController.m b/macosx/HBController.m index e320b3da7..29b69da18 100644 --- a/macosx/HBController.m +++ b/macosx/HBController.m @@ -1223,7 +1223,7 @@ [alert addButtonWithTitle:NSLocalizedString(@"Overwrite", nil)]; [alert setAlertStyle:NSCriticalAlertStyle]; - [alert beginSheetModalForWindow:self.window modalDelegate:self didEndSelector:@selector(overwriteAddTitlesToQueueAlertDone:returnCode:contextInfo:) contextInfo:(__bridge void *)(jobs)]; + [alert beginSheetModalForWindow:self.window modalDelegate:self didEndSelector:@selector(overwriteAddTitlesToQueueAlertDone:returnCode:contextInfo:) contextInfo:(void *)CFBridgingRetain(jobs)]; } else { @@ -1237,7 +1237,7 @@ { if (returnCode == NSAlertSecondButtonReturn) { - NSArray *jobs = (__bridge NSArray *)contextInfo; + NSArray *jobs = CFBridgingRelease(contextInfo); [fQueueController addJobsFromArray:jobs]; } } @@ -1316,7 +1316,7 @@ HBAddPresetController *addPresetController = [[HBAddPresetController alloc] initWithPreset:[self createPresetFromCurrentSettings] videoSize:NSMakeSize(self.job.picture.width, self.job.picture.height)]; - [NSApp beginSheet:addPresetController.window modalForWindow:self.window modalDelegate:self didEndSelector:@selector(sheetDidEnd:returnCode:contextInfo:) contextInfo:(__bridge void *)(addPresetController)]; + [NSApp beginSheet:addPresetController.window modalForWindow:self.window modalDelegate:self didEndSelector:@selector(sheetDidEnd:returnCode:contextInfo:) contextInfo:(void *)CFBridgingRetain(addPresetController)]; } - (void)sheetDidEnd:(NSWindow *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo @@ -1327,7 +1327,6 @@ { [presetManager addPreset:addPresetController.preset]; } - } - (HBPreset *)createPresetFromCurrentSettings |