summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--macosx/Controller.h1
-rw-r--r--macosx/Controller.m10
2 files changed, 2 insertions, 9 deletions
diff --git a/macosx/Controller.h b/macosx/Controller.h
index 760dcf0de..5b7864e75 100644
--- 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 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];
}