From 4dd7104af8f8ff10a81d6e9944e50a62f7b7e04f Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 6 Mar 2015 10:48:34 +0100
Subject: osx: terminate argv properly when arguments are removed

The player now relies on the (slightly obscure) requirement that argv is
NULL-terminated.

Might fix #1652.
---
 osdep/macosx_application.m | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'osdep')

diff --git a/osdep/macosx_application.m b/osdep/macosx_application.m
index 818d8df379..ac1f4863da 100644
--- a/osdep/macosx_application.m
+++ b/osdep/macosx_application.m
@@ -366,7 +366,10 @@ int cocoa_main(mpv_main_fn mpv_main, int argc, char *argv[])
         ctx.argv     = &argv;
 
         if (bundle_started_from_finder(argc, argv)) {
-            argc = 1; // clears out -psn argument is present
+            if (argc > 1) {
+                argc = 1; // clears out -psn argument if present
+                argv[1] = NULL;
+            }
             macosx_redirect_output_to_logfile("mpv");
             init_cocoa_application(true);
         } else {
-- 
cgit v1.2.3