diff options
author | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2013-10-24 21:24:36 +0200 |
---|---|---|
committer | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2013-10-24 21:37:55 +0200 |
commit | bbc1469272bce28c670c8e21965d856d1ea1f5d3 (patch) | |
tree | f0dae36b6fddff50351c45d6453cf115af81fe7a /osdep | |
parent | c54a1f3e412e107f3eb675e5276839cf0038c4fa (diff) | |
download | mpv-bbc1469272bce28c670c8e21965d856d1ea1f5d3.tar.bz2 mpv-bbc1469272bce28c670c8e21965d856d1ea1f5d3.tar.xz |
cocoa: fix opening quarantined files on 10.9 with the bundle
It looks like on Mavericks the Finder is passing different arguments to mpv
depending on whether the opened file is quarantined or not.
Fixes #285
Diffstat (limited to 'osdep')
-rw-r--r-- | osdep/macosx_application.m | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/osdep/macosx_application.m b/osdep/macosx_application.m index 50d5a5bb4f..f2ec87a55a 100644 --- a/osdep/macosx_application.m +++ b/osdep/macosx_application.m @@ -463,10 +463,15 @@ static bool bundle_started_from_finder(int argc, char **argv) bool bundle_detected = [[NSBundle mainBundle] bundleIdentifier]; int major, minor, bugfix; get_system_version(&major, &minor, &bugfix); + bool with_psn = bundle_detected && argc==1; + bool without_psn = bundle_detected && argc==2 && is_psn_argument(argv[1]); + if ((major == 10) && (minor >= 9)) { - return bundle_detected && argc==1; + // Looks like opening quarantined files from the finder inserts the + // -psn argument while normal files do not. Hurr. + return with_psn || without_psn; } else { - return bundle_detected && argc==2 && is_psn_argument(argv[1]); + return with_psn; } } |