Fixed missing iterator for boardPreferences.

Former-commit-id: 5f18958
chipKIT32 · Mar 27, 2011 · fb4ed64 · fb4ed64
1 parent 4df1607
commit fb4ed64
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/app/src/processing/app/debug/Compiler.java b/app/src/processing/app/debug/Compiler.java
@@ -134,7 +134,7 @@ public boolean compile(Sketch sketch, String buildPath,String primaryClassName,
 		this.objectFiles = new ArrayList<File>();
 
 		//Put all the global preference configuration into one Master configpreferences
-	    configPreferences = mergePreferences( Preferences.getMap(), platformPreferences, this.boardPreferences);
+	    configPreferences = mergePreferences( Preferences.getMap(), platformPreferences, Base.getBoardPreferences());
 
 		// 0. include paths for core + all libraries
 		this.includePaths = new ArrayList();
@@ -765,8 +765,8 @@ HashMap mergePreferences(Map Preferences,  Map platformPreferences, Map boardPre
 	    }
 
 		System.out.println("Done: platformPreferences");
-		boardPreferences.entrySet().iterator();
-       
+		iterator = boardPreferences.entrySet().iterator();
+
         while(iterator.hasNext())
   	    {
   	    	Map.Entry pair = (Map.Entry)iterator.next();
@@ -779,7 +779,7 @@ HashMap mergePreferences(Map Preferences,  Map platformPreferences, Map boardPre
   	    	{
   	    		_map.put(pair.getKey(), pair.getValue());
   	    	}
-            System.out.println(pair.getKey() + " = " + pair.getValue());
+            //System.out.println(pair.getKey() + " = " + pair.getValue());
 	    }
 		System.out.println("Done: boardPreferences");