Merge pull request #46 from msdsoftware/master

Revert "Remove unnecessary global static state"

appbundler/native/main.m

@@ -81,8 +81,12 @@ typedef int (JNICALL *JLI_Launch_t)(int argc, char ** argv,
 static bool isVerbose = false;
 static bool isDebugging = false;
 
+static char** progargv = NULL;
+static int progargc = 0;
+static int launchCount = 0;
+
 const char * tmpFile();
-int launch(char *, int, char **, int launchCount);
+int launch(char *, int, char **);
 
 NSString * findJavaDylib (NSString *, bool, bool, bool, bool);
 NSString * findJREDylib (int, bool, bool);
@@ -99,16 +103,12 @@ int main(int argc, char *argv[]) {
 
     int result;
     @try {
-        char** progargv = NULL;
-        int progargc = 0;
-        int launchCount = 0;
-
         if ((argc > 1) && (launchCount == 0)) {
             progargc = argc - 1;
             progargv = &argv[1];
         }
 
-        launch(argv[0], progargc, progargv, launchCount);
+        launch(argv[0], progargc, progargv);
         result = 0;
     } @catch (NSException *exception) {
         NSAlert *alert = [[NSAlert alloc] init];
@@ -124,7 +124,7 @@ int main(int argc, char *argv[]) {
     return result;
 }
 
-int launch(char *commandName, int progargc, char *progargv[], int launchCount) {
+int launch(char *commandName, int progargc, char *progargv[]) {
 
     // check args for `--verbose`
     for (int i = 0; i < progargc; i++) {
@@ -144,7 +144,7 @@ int launch(char *commandName, int progargc, char *progargv[], int launchCount) {
     NSDictionary *infoDictionary = [mainBundle infoDictionary];
 
     // Test for debugging (but only on the second runthrough)
-    bool isDebugging = [[infoDictionary objectForKey:@JVM_DEBUG_KEY] boolValue];
+    bool isDebugging = (launchCount > 0) && [[infoDictionary objectForKey:@JVM_DEBUG_KEY] boolValue];
 
     Log(@"\n\n\n\nLoading Application '%@'", [infoDictionary objectForKey:@"CFBundleName"]);