summaryrefslogtreecommitdiffstats
path: root/macosx/Controller.m
diff options
context:
space:
mode:
authordynaflash <[email protected]>2011-05-19 19:33:10 +0000
committerdynaflash <[email protected]>2011-05-19 19:33:10 +0000
commit23c58d38703100a80179a69c688cb28fbb35cff1 (patch)
tree214cfa9655f0dcd6c7c8b878fe5e8c095ac92269 /macosx/Controller.m
parent43e8ef8651cc4d1b9529885dace646c4a9566e14 (diff)
MacGui: Don't assign nil to ints (duh)
- As per https://reviews.handbrake.fr/r/88/ - Patch by blindjimmy, once again thanks! git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3985 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx/Controller.m')
-rw-r--r--macosx/Controller.m10
1 files changed, 2 insertions, 8 deletions
diff --git a/macosx/Controller.m b/macosx/Controller.m
index ec5c15470..e9631c346 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -2978,8 +2978,6 @@ fWorkingCount = 0;
//[fPresetsOutlineView selectRow:[[queueToApply objectForKey:@"PresetIndexNum"] intValue]];
/* Change UI to show "Custom" settings are being used */
//[fPresetSelectedDisplay setStringValue: [[queueToApply objectForKey:@"PresetName"] stringValue]];
-
- curUserPresetChosenNum = nil;
}
else
{
@@ -2987,8 +2985,6 @@ fWorkingCount = 0;
[fPresetsOutlineView deselectRow:[fPresetsOutlineView selectedRow]];
/* Change UI to show "Custom" settings are being used */
[fPresetSelectedDisplay setStringValue: @"Custom"];
-
- //curUserPresetChosenNum = nil;
}
/* We need to set this bool back to NO, in case the user wants to do a scan */
@@ -3089,7 +3085,7 @@ fWorkingCount = 0;
NSMutableArray *subtitlesArray = [[NSMutableArray alloc] initWithArray:[fSubtitlesDelegate getSubtitleArray] copyItems:YES];
-int subtitle = nil;
+int subtitle;
int force;
int burned;
int def;
@@ -3588,7 +3584,7 @@ bool one_burned = FALSE;
* to the source tracks position in title->list_subtitle.
*/
-int subtitle = nil;
+int subtitle;
int force;
int burned;
int def;
@@ -4575,8 +4571,6 @@ the user is using "Custom" settings by determining the sender*/
[fPresetsOutlineView deselectRow:[fPresetsOutlineView selectedRow]];
/* Change UI to show "Custom" settings are being used */
[fPresetSelectedDisplay setStringValue: @"Custom"];
-
- curUserPresetChosenNum = nil;
}
[self calculateBitrate:nil];
}