# HG changeset patch
# User timkelly
# Date 1287073644 18000
# Node ID ac14826aa14b0104e1b930c6d9a668cb37fc23cc
# Parent  90c82caa691853793c3e4482c99e4747fddbc170# Parent  76029713f5704fbf7d9a7d2637ab8943c65ac254
merge commit

diff -r 76029713f570 -r ac14826aa14b builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/TestCreateGlobalPrefs.java
--- a/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/TestCreateGlobalPrefs.java	Wed Oct 13 14:15:17 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/TestCreateGlobalPrefs.java	Thu Oct 14 11:27:24 2010 -0500
@@ -33,8 +33,6 @@
 	//com.nokia.carbide.cpp.logging.LoggingPreferencesPage
 	private static final String[] carbidePrefIds = { "com.nokia.carbide.cpp.sdk.ui.preferences.BuildPlatformFilterPage",
 		"com.nokia.carbide.cpp.internal.sdk.ui.SDKPreferencePage",
-		"com.nokia.carbide.cpp.internal.sdk.ui.SDKPreferencePage",
-		"com.nokia.carbide.cdt.internal.builder.ui.BuilderPreferencePage",
 		"com.nokia.carbide.cpp.preferences.ExtensionsPreferencesPage",
 		"com.nokia.carbide.cpp.internal.builder.utils.ui.PreprocessPreferencePage",
 		"com.nokia.carbide.cpp.internal.project.ui.preferences.CarbidePreferencePage",
@@ -64,11 +62,11 @@
 //		make sure to run on UI thread
 //		Display getAsynch()
 //		capture and throw exception
-//		wait to finish before existing
+//		wait to finish before exiting
 		
 		// TODO: Need to throw exception on error when loading a pref page
 		
-		Display.getDefault().asyncExec(new Runnable() {
+		Display.getDefault().syncExec(new Runnable() {
 
 			@Override
 			public void run() {