From 518dece3685c75dca7c846b0b90fc72d3bf485ee Mon Sep 17 00:00:00 2001 From: rdb Date: Fri, 25 Oct 2019 10:37:02 +0200 Subject: [PATCH] deploy-ng: strip -psn_* argument that macOS passes to GUI apps --- pandatool/src/deploy-stub/deploy-stub.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pandatool/src/deploy-stub/deploy-stub.c b/pandatool/src/deploy-stub/deploy-stub.c index 707694a8ca..e30482654e 100644 --- a/pandatool/src/deploy-stub/deploy-stub.c +++ b/pandatool/src/deploy-stub/deploy-stub.c @@ -650,6 +650,15 @@ int main(int argc, char *argv[]) { void *blob = NULL; log_filename = NULL; +#ifdef __APPLE__ + // Strip a -psn_xxx argument passed in by macOS when run from an .app bundle. + if (argc > 1 && strncmp(argv[1], "-psn_", 5) == 0) { + argv[1] = argv[0]; + ++argv; + --argc; + } +#endif + /* printf("blob_offset: %d\n", (int)blobinfo.blob_offset); printf("blob_size: %d\n", (int)blobinfo.blob_size);