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

diff --git a/macosx/Controller.h b/macosx/Controller.h
index 760dcf0de44130dd9f8a075988ae64d54e9a31bd..5b7864e758ee4bf28055728a34879397171931e9 100644 (file)
--- a/macosx/Controller.h
+++ b/macosx/Controller.h
@@ -204,7 +204,6 @@ BOOL                        fIsDragging;
        NSMutableArray               * UserPresets;
        NSMutableArray               * UserPresetssortedArray;
        NSMutableDictionary          * chosenPreset;
-    int                            curUserPresetChosenNum;
         
        NSMutableDictionary          *presetHbDefault; // this is 1 in "Default" preset key
        NSMutableDictionary          *presetUserDefault;// this is 2 in "Default" preset key

diff --git a/macosx/Controller.m b/macosx/Controller.m
index ec5c154709c7b26e4e360fb6f3b742eb3e06d3c1..e9631c3461b566c4a21ea8f72f7673020c335d8d 100644 (file)
--- 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];
 }