summaryrefslogtreecommitdiffstats
path: root/macosx
diff options
context:
space:
mode:
authorritsuka <[email protected]>2015-06-01 17:18:35 +0000
committerritsuka <[email protected]>2015-06-01 17:18:35 +0000
commitc0cb605ff2e3fff65db994506df8f6f7253b5ad8 (patch)
tree52032597d3815bf4b424dc9a1a4f521751c6f329 /macosx
parentabefd8dfa1e9a4690e1487b854b25eeb247c1903 (diff)
MacGui: do not try to create a NSURL if the path if empty. Encode the right type for the deblock filter.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7255 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx')
-rw-r--r--macosx/HBFilters.m2
-rw-r--r--macosx/HBJob+UIAdditions.m6
2 files changed, 6 insertions, 2 deletions
diff --git a/macosx/HBFilters.m b/macosx/HBFilters.m
index ebd38558c..33116a474 100644
--- a/macosx/HBFilters.m
+++ b/macosx/HBFilters.m
@@ -282,7 +282,7 @@ NSString * const HBFiltersChangedNotification = @"HBFiltersChangedNotification";
encodeObject(_denoiseTune);
encodeObject(_denoiseCustomString);
- encodeInteger(_deblock);
+ encodeInt(_deblock);
encodeBool(_grayscale);
encodeBool(_useDecomb);
diff --git a/macosx/HBJob+UIAdditions.m b/macosx/HBJob+UIAdditions.m
index 2d126dd5b..7eae8a773 100644
--- a/macosx/HBJob+UIAdditions.m
+++ b/macosx/HBJob+UIAdditions.m
@@ -556,7 +556,11 @@ static NSDictionary *shortHeightAttr;
- (id)reverseTransformedValue:(id)value
{
- return [NSURL fileURLWithPath:value];
+ if (value)
+ {
+ return [NSURL fileURLWithPath:value];
+ }
+ return nil;
}
@end