From 100ffddbcd0854b97e5b5e4946e35e163f2014d3 Mon Sep 17 00:00:00 2001 From: Damian Minkov Date: Thu, 7 Nov 2013 15:35:08 +0200 Subject: [PATCH] Updates macosx launcher to skip -psn parameters as they prevents the application from starting. --- resources/install/macosx/JavaApplicationStub | Bin 47180 -> 47180 bytes src/native/macosx/launcher/launcher.m | 21 ++++++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/resources/install/macosx/JavaApplicationStub b/resources/install/macosx/JavaApplicationStub index dd4686fafc13846b175eececd25a4d3aa648bf55..25a52e64c3ea97eb0d91d920e250b581138501b2 100755 GIT binary patch delta 7171 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 UbH_m#Kgqqr9!Kxk`dz~R1Jy{uVE_OC delta 6846 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 diff --git a/src/native/macosx/launcher/launcher.m b/src/native/macosx/launcher/launcher.m index baf756c31..7c5b072b2 100644 --- a/src/native/macosx/launcher/launcher.m +++ b/src/native/macosx/launcher/launcher.m @@ -188,6 +188,15 @@ JLI_Launch_t getLauncher(NSDictionary *javaDictionary) void launchJitsi(int argMainCount, char *argMainValues[]) { + // special psn args that we will skip, + // those args are added when application is started from finder + int psnArgsCount = 0; + for(int i = 0; i < argMainCount; i++) + { + if(memcmp(argMainValues[i], "-psn_", 4) == 0) + psnArgsCount++; + } + NSBundle *mainBundle = [NSBundle mainBundle]; NSDictionary *infoDictionary = [mainBundle infoDictionary]; @@ -269,11 +278,11 @@ void launchJitsi(int argMainCount, char *argMainValues[]) appArgc = jargc; // Initialize the arguments to JLI_Launch() - int argc = 2 + [sprops count] + 1 + appArgc; + int argc = 2 + [sprops count] + 1 + appArgc - psnArgsCount; if(options != NULL) argc++; - char *argv[argc + appArgc]; + char *argv[argc]; int i = 0; argv[i++] = argMainValues[0]; @@ -308,10 +317,16 @@ void launchJitsi(int argMainCount, char *argMainValues[]) // the params are last in the array of arguments for(int j = appArgc; j > 0; j--) { - argv[i++] = strdup(argMainValues[argMainCount-j]); + // skip -psn args + if (memcmp(argMainValues[argMainCount-j], "-psn_", 4) != 0) + argv[i++] = strdup(argMainValues[argMainCount-j]); } argsSupplied++; + // once psn args are filtered, no more count them as they will not be + // supplied to the launch function + jargc = jargc - psnArgsCount; + // Invoke JLI_Launch() jli_LaunchFxnPtr(argc, argv, 0, NULL,