summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2013-09-12 08:26:47 +0200
committerStefano Pigozzi <stefano.pigozzi@gmail.com>2013-09-12 18:42:59 +0200
commit86c05655d43083cea79a84764a3c5c114bac4eaa (patch)
tree42f2b8af80797a3503c3fe377986bb7eb953cd8e
parentbe96a25dad419d8137761a0bc0ef7b3ed5d34c16 (diff)
downloadmpv-86c05655d43083cea79a84764a3c5c114bac4eaa.tar.bz2
mpv-86c05655d43083cea79a84764a3c5c114bac4eaa.tar.xz
macosx_application: fix file opening on OS X 10.9 (hopefully)
File opening through Finder, apparently drops `--psn` arguments on Mavericks and just uses no args. Modify the code to account for that case. This wasn't tested on 10.9 itself (I don't have a paid dev account), but it *should* work if I understood the problem correctly.
-rw-r--r--osdep/macosx_application.m11
1 files changed, 10 insertions, 1 deletions
diff --git a/osdep/macosx_application.m b/osdep/macosx_application.m
index a522ad77fa..c292c1fd53 100644
--- a/osdep/macosx_application.m
+++ b/osdep/macosx_application.m
@@ -425,11 +425,20 @@ static bool psn_matches_current_process(char *psn_arg_to_check)
return [real_psn isEqualToString:in_psn];
}
+static bool bundle_started_from_finder(int argc, char **argv)
+{
+ bool bundle_detected = [[NSBundle mainBundle] bundleIdentifier];
+ bool pre_mavericks_args = argc==2 && psn_matches_current_process(argv[1]);
+ bool post_mavericks_args = argc==0;
+
+ return bundle_detected && (pre_mavericks_args || post_mavericks_args);
+}
+
void macosx_finder_args_preinit(int *argc, char ***argv)
{
Application *app = mpv_shared_app();
- if (*argc==2 && psn_matches_current_process((*argv)[1])) {
+ if (bundle_started_from_finder(*argc, *argv)) {
macosx_redirect_output_to_logfile("mpv");
macosx_wait_fileopen_events();