RESOLVED - bug 194341: Could not save task list during shutdown

https://bugs.eclipse.org/bugs/show_bug.cgi?id=194341

2 files changed, 9 insertions, 7 deletions

diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskRepositoriesView.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskRepositoriesView.java
index 74d534c41..0c81ab6b5 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskRepositoriesView.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskRepositoriesView.java
@@ -91,12 +91,14 @@ public class TaskRepositoriesView extends ViewPart {
 	}
 
 	public static TaskRepositoriesView getFromActivePerspective() {
-		IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-		if (activePage == null)
-			return null;
-		IViewPart view = activePage.findView(ID);
-		if (view instanceof TaskRepositoriesView)
-			return (TaskRepositoriesView) view;
+		if (PlatformUI.getWorkbench().getActiveWorkbenchWindow() != null) {
+			IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
+			if (activePage == null)
+				return null;
+			IViewPart view = activePage.findView(ID);
+			if (view instanceof TaskRepositoriesView)
+				return (TaskRepositoriesView) view;
+		}
 		return null;
 	}
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListManager.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListManager.java
index ea3d0fb4b..5ba9d9e51 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListManager.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListManager.java
@@ -798,7 +798,7 @@ public class TaskListManager implements IPropertyChangeListener {
 	 */
 	public synchronized void saveTaskList() {
 		try {
-			if (taskListInitialized) {
+			if (taskListInitialized && taskListSaveManager != null) {
 				taskListSaveManager.saveTaskList(true, false);
 				// TasksUiPlugin.getDefault().getPreferenceStore().setValue(TaskListPreferenceConstants.TASK_ID,
 				// nextLocalTaskId);