summaryrefslogtreecommitdiffstats
path: root/macosx/HBQueueController.mm
diff options
context:
space:
mode:
authordynaflash <[email protected]>2008-09-22 17:46:32 +0000
committerdynaflash <[email protected]>2008-09-22 17:46:32 +0000
commita7fb7371bb83e6d244783de10e3006f618d44410 (patch)
tree8dd6583e24a6d22561821a2cc9817da36241663b /macosx/HBQueueController.mm
parent53058602694c8d17942dc874817b42cb9a6be51a (diff)
MacGui: Re-enable deleting encodes with the delete key if hilighted.
- Currently one at a time, multiple selections are shut off for queue sync reasons . - Note: To delete a finished encode, click on it and hit your delete key ( since the action icon is an "open file in finder" magnifying glass) as this is the only way currently to delete a finished encode. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1744 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx/HBQueueController.mm')
-rw-r--r--macosx/HBQueueController.mm13
1 files changed, 12 insertions, 1 deletions
diff --git a/macosx/HBQueueController.mm b/macosx/HBQueueController.mm
index b32e4de3e..e1d01ccc8 100644
--- a/macosx/HBQueueController.mm
+++ b/macosx/HBQueueController.mm
@@ -485,7 +485,11 @@ if (fWorkingCount > 0)
if ([[[fJobGroups objectAtIndex:row] objectForKey:@"Status"] intValue] == 1)
{
- NSString * alertTitle = [NSString stringWithFormat:NSLocalizedString(@"Stop This Encode and Remove It ?", nil)];
+ /* We pause the encode here so that it doesn't finish right after and then
+ * screw up the sync while the window is open
+ */
+ [fHBController Pause:NULL];
+ NSString * alertTitle = [NSString stringWithFormat:NSLocalizedString(@"Stop This Encode and Remove It ?", nil)];
// Which window to attach the sheet to?
NSWindow * docWindow;
if ([sender respondsToSelector: @selector(window)])
@@ -512,6 +516,13 @@ if (fWorkingCount > 0)
- (void) didDimissCancelCurrentJob: (NSWindow *)sheet returnCode: (int)returnCode contextInfo: (void *)contextInfo
{
+ /* We resume encoding and perform the appropriate actions
+ * Note: Pause: is a toggle type method based on hb's current
+ * state, if it paused, it will resume encoding and vice versa.
+ * In this case, we are paused from the calling window, so calling
+ * [fHBController Pause:NULL]; Again will resume encoding
+ */
+ [fHBController Pause:NULL];
if (returnCode == NSAlertOtherReturn)
{
/* We need to save the currently encoding item number first */