Modified preferences initialization in BaseNoGui.

bitron · cmaglie · commit 2de206cccd80 · 2014-11-13T16:23:46.000+01:00
diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
@@ -101,7 +101,7 @@ static public void main(String args[]) throws Exception {
 
     BaseNoGui.initPortableFolder();
 
-    BaseNoGui.prescanParameters(args);
+    BaseNoGui.initParameters(args);
     
     BaseNoGui.initVersion();
     VERSION_NAME = BaseNoGui.VERSION_NAME;
diff --git a/app/src/processing/app/BaseNoGui.java b/app/src/processing/app/BaseNoGui.java
@@ -677,9 +677,7 @@ static public void main(String args[]) throws Exception {
     
     initPortableFolder();
     
-    PreferencesData.init(null);
-    
-    prescanParameters(args);
+    initParameters(args);
     
     init(args);
   }
@@ -744,7 +742,7 @@ static public void populateImportToLibraryTable() {
     }
   }
 
-  static public void prescanParameters(String args[]) {
+  static public void initParameters(String args[]) {
     String preferencesFile = null;
 
     // Do a first pass over the commandline arguments, the rest of them

Original file line number	Diff line number	Diff line change
`@@ -677,9 +677,7 @@ static public void main(String args[]) throws Exception {`
`677`	`677`
`678`	`678`	`initPortableFolder();`
`679`	`679`
`680`		`- PreferencesData.init(null);`
`681`		`-`
`682`		`- prescanParameters(args);`
	`680`	`+ initParameters(args);`
`683`	`681`
`684`	`682`	`init(args);`
`685`	`683`	`}`
`@@ -744,7 +742,7 @@ static public void populateImportToLibraryTable() {`
`744`	`742`	`}`
`745`	`743`	`}`
`746`	`744`
`747`		`- static public void prescanParameters(String args[]) {`
	`745`	`+ static public void initParameters(String args[]) {`
`748`	`746`	`String preferencesFile = null;`
`749`	`747`
`750`	`748`	`// Do a first pass over the commandline arguments, the rest of them`