RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-05-07 02:31:02 +00:00
Code Issues Releases Wiki Activity

macosx_application: fix file opening on OS X 10.9 (hopefully)

Browse Source 
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.
This commit is contained in:
Stefano Pigozzi 2013-09-12 08:26:47 +02:00
parent be96a25dad
commit 86c05655d4
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
osdep/macosx_application.m
View File

@ -425,11 +425,20 @@ static bool psn_matches_current_process(char *psn_arg_to_check)
return [real_psn isEqualToString:in_psn]; 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) void macosx_finder_args_preinit(int *argc, char ***argv)
{ {
Application *app = mpv_shared_app(); 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_redirect_output_to_logfile("mpv");
macosx_wait_fileopen_events(); macosx_wait_fileopen_events();