Initialize sketch args before calling settings()

JakubValtar · JakubValtar · commit faab7b84a4e0 · 2016-01-01T22:29:30.000+01:00
diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
@@ -10231,6 +10231,13 @@ static public void runSketch(final String[] args,
 //    }
     sketch.sketchPath = folder;
 
+    // Don't set 'args' to a zero-length array if it should be null [3.0a8]
+    if (args.length != argIndex + 1) {
+      // pass everything after the class name in as args to the sketch itself
+      // (fixed for 2.0a5, this was just subsetting by 1, which didn't skip opts)
+      sketch.args = PApplet.subset(args, argIndex + 1);
+    }
+
     // Call the settings() method which will give us our size() call
 //    try {
     sketch.handleSettings();
@@ -10252,13 +10259,6 @@ static public void runSketch(final String[] args,
 //    //fullScreen |= sketch.sketchFullScreen();
 //    sketch.fullScreen |= fullScreen;
 
-    // Don't set 'args' to a zero-length array if it should be null [3.0a8]
-    if (args.length != argIndex + 1) {
-      // pass everything after the class name in as args to the sketch itself
-      // (fixed for 2.0a5, this was just subsetting by 1, which didn't skip opts)
-      sketch.args = PApplet.subset(args, argIndex + 1);
-    }
-
     sketch.external = external;
 
     if (windowColor != 0) {
