From 8bbc86236d4fe653f66d45f3b4d5cb92c8614f5e Mon Sep 17 00:00:00 2001
From: ritsuka <damiog@gmail.com>
Date: Wed, 27 Aug 2014 16:59:07 +0000
Subject: [PATCH] MacGui: removed the PresetIndexNum from the queue job dict.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6370 b64f7644-9d1e-0410-96f1-a4d463321fa5
---
macosx/Controller.m | 21 ++++-----------------
1 file changed, 4 insertions(+), 17 deletions(-)
diff --git a/macosx/Controller.m b/macosx/Controller.m
index 580b51348..adbddd880 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -2444,7 +2444,6 @@ fWorkingCount = 0;
/* Lets get the preset info if there is any */
[queueFileJob setObject:[fPresetSelectedDisplay stringValue] forKey:@"PresetName"];
- [queueFileJob setObject:[NSNumber numberWithInteger:fPresetsView.indexOfSelectedItem] forKey:@"PresetIndexNum"];
[queueFileJob setObject:[fDstFormatPopUp titleOfSelectedItem] forKey:@"FileFormat"];
/* Chapter Markers*/
@@ -2945,22 +2944,10 @@ fWorkingCount = 0;
[fPictureController setTitle:fTitle];
[self pictureSettingsDidChange];
- if ([queueToApply objectForKey:@"PresetIndexNum"]) // This item used a preset so insert that info
- {
- /* somehow we need to figure out a way to tie the queue item to a preset if it used one */
- }
- else
- {
- /* Deselect the currently selected Preset if there is one*/
- [fPresetsView deselect];
- /* Change UI to show "Custom" settings are being used */
- [fPresetSelectedDisplay setStringValue: @"Custom"];
- }
-
- /* We need to set this bool back to NO, in case the user wants to do a scan */
- //applyQueueToScan = NO;
-
- /* Not that source is loaded and settings applied, delete the queue item from the queue */
+ [fPresetSelectedDisplay setStringValue:queueToApply[@"PresetName"]];
+ [fPresetsView deselect];
+
+ /* Now that source is loaded and settings applied, delete the queue item from the queue */
[HBUtilities writeToActivityLog: "applyQueueSettingsToMainWindow: deleting queue item:%d",fqueueEditRescanItemNum];
[self removeQueueFileItem:fqueueEditRescanItemNum];
}
--
2.40.0