dvdnav: fix crash when poorly masterd disc has no menus

[handbrake-jp/handbrake-jp-git.git] / macosx / InstantHandBrake / ExpressController.m

diff --git a/macosx/InstantHandBrake/ExpressController.m b/macosx/InstantHandBrake/ExpressController.m
index 6775851..37ab8b0 100644 (file)
--- a/macosx/InstantHandBrake/ExpressController.m
+++ b/macosx/InstantHandBrake/ExpressController.m
@@ -103,6 +103,8 @@
     [[NSNotificationCenter defaultCenter] addObserver:self
     selector:@selector(workDone:)
     name:@"HBCoreWorkDoneNotification" object:nil];
+    
+    [GrowlApplicationBridge setGrowlDelegate: self];
 }
 
 - (void) applicationWillTerminate: (NSNotification *) n
@@ -218,6 +220,10 @@
                         title->seconds];
             }
         }
+        else if( [[col identifier] isEqualToString: @"Size"] )
+        {
+            return [NSString stringWithFormat:@"-"];
+        }
     }
     return nil;
 }
@@ -363,7 +369,7 @@
                        job->vbitrate /= 2;
         }
         
-        if ( [fConvertAspectPopUp indexOfSelectedItem] )
+        if ( [fConvertAspectPopUp indexOfSelectedItem] > 0 )
         {
             do
             {
@@ -373,6 +379,8 @@
         }
         else
         {
+            /* Reset job->crop values */
+            memcpy( job->crop, job->title->crop, 4 * sizeof( int ) );
             job->width = maxwidth;
             hb_fix_aspect( job, HB_KEEP_WIDTH );
         }