1 files changed, 7 insertions, 8 deletions

diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/provisional/tasklist/MylarTaskListPlugin.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/provisional/tasklist/MylarTaskListPlugin.java
index c6058b737..c8268eba4 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/provisional/tasklist/MylarTaskListPlugin.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/provisional/tasklist/MylarTaskListPlugin.java
@@ -66,7 +66,7 @@ public class MylarTaskListPlugin extends AbstractUIPlugin implements IStartup {
 
 	private static TaskRepositoryManager taskRepositoryManager;
 
-	private TaskListSaveManager taskListSaveManager;
+	private TaskListSaveManager taskListSaveManager = new TaskListSaveManager();
 	
 	private TaskListRefreshManager taskListRefreshManager;
 	
@@ -94,7 +94,7 @@ public class MylarTaskListPlugin extends AbstractUIPlugin implements IStartup {
 	
 	private boolean initialized = false;
 	
-	private Map<AbstractRepositoryConnector, Image> brandingIcons = new HashMap<AbstractRepositoryConnector, Image>();
+	private Map<AbstractRepositoryClient, Image> brandingIcons = new HashMap<AbstractRepositoryClient, Image>();
 	
 	public enum TaskListSaveMode {
 		ONE_HOUR, THREE_HOURS, DAY;
@@ -284,12 +284,14 @@ public class MylarTaskListPlugin extends AbstractUIPlugin implements IStartup {
 					taskRepositoryManager.readRepositories();
 
 					taskListManager.addListener(CONTEXT_TASK_ACTIVITY_LISTENER);
+					taskListManager.addListener(taskListSaveManager);
+
 					taskListManager.readExistingOrCreateNewList();
 					initialized = true;
 					migrateHandlesToRepositorySupport();
 
 					if (getPrefs().getBoolean(TaskListPreferenceConstants.REPOSITORY_SYNCH_ON_STARTUP)) {
-						for (AbstractRepositoryConnector repositoryClient : taskRepositoryManager.getRepositoryClients()) {
+						for (AbstractRepositoryClient repositoryClient : taskRepositoryManager.getRepositoryClients()) {
 							repositoryClient.synchronize();
 						}
 					}
@@ -303,9 +305,6 @@ public class MylarTaskListPlugin extends AbstractUIPlugin implements IStartup {
 					taskListRefreshManager = new TaskListRefreshManager();
 					taskListRefreshManager.startRefreshJob();	
 					
-					taskListSaveManager = new TaskListSaveManager();
-					taskListManager.addListener(taskListSaveManager); 
-					
 					MylarPlugin.getDefault().getPluginPreferences().addPropertyChangeListener(PREFERENCE_LISTENER);					
 					getPrefs().addPropertyChangeListener(taskListRefreshManager);
 					PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell().addDisposeListener(
@@ -576,14 +575,14 @@ public class MylarTaskListPlugin extends AbstractUIPlugin implements IStartup {
 		return taskRepositoryManager;
 	}
 
-	public Map<AbstractRepositoryConnector, Image> getBrandingIcons() {
+	public Map<AbstractRepositoryClient, Image> getBrandingIcons() {
 		return brandingIcons;
 	}
 
 	public boolean isInitialized() {
 		return initialized;
 	}
-} 
+}
 
 // /**
 // * Sets the directory containing the task list file to use.