diff options
author | ritsuka <[email protected]> | 2014-12-30 07:13:07 +0000 |
---|---|---|
committer | ritsuka <[email protected]> | 2014-12-30 07:13:07 +0000 |
commit | e85690352f677b49355633570ae1b34bb953f411 (patch) | |
tree | a5422a1bfa4af11f903cd69ea4d62765ce9f844e /macosx/HBVideoController.m | |
parent | 30d1c1cc1e7db5336ba614947dfecb54b453917d (diff) |
MacGui: fix a bunch of regressions (various crash when in some textfields, encode log going to the wrong directory).
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6676 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx/HBVideoController.m')
-rw-r--r-- | macosx/HBVideoController.m | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/macosx/HBVideoController.m b/macosx/HBVideoController.m index 95a956bda..e2d5d760d 100644 --- a/macosx/HBVideoController.m +++ b/macosx/HBVideoController.m @@ -7,6 +7,7 @@ #import "HBVideoController.h" #import "HBAdvancedController.h" #import "HBVideo+UIAdditions.h" +#import "HBJob.h" #include "hb.h" @@ -36,6 +37,7 @@ static void *HBVideoControllerContext = &HBVideoControllerContext; } @property (nonatomic, retain, readwrite) HBAdvancedController *advancedController; +@property (nonatomic, readwrite, assign) HBVideo *video; @property (nonatomic, readwrite) BOOL presetViewEnabled; @@ -84,11 +86,12 @@ static void *HBVideoControllerContext = &HBVideoControllerContext; return self; } -- (void)setVideo:(HBVideo *)video +- (void)setJob:(HBJob *)job { - _video = video; + _job = job; + self.video = job.video; - if (_video) + if (job) { self.labelColor = [NSColor controlTextColor]; } @@ -97,7 +100,7 @@ static void *HBVideoControllerContext = &HBVideoControllerContext; self.labelColor = [NSColor disabledControlTextColor]; } - [self enableEncoderOptionsWidgets:(video != nil)]; + [self enableEncoderOptionsWidgets:(job != nil)]; } #pragma mark - KVO |