From 9e6532482888741f258cbbc8efbbf300f740f59a Mon Sep 17 00:00:00 2001
From: Steffen Pingel
Date: Wed, 31 Oct 2012 03:48:57 +0100
Subject: 383987: stopping o.e.m.tasks.ui fails if backup manager is not
 initialized

Change-Id: Id02cd0ce49190613f1b12649d5413dbb474527c6
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=383987
---
 .../src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java
index ba9d3cea9..dec13eeca 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java
@@ -775,8 +775,12 @@ public class TasksUiPlugin extends AbstractUIPlugin {
 			}
 
 			if (PlatformUI.isWorkbenchRunning()) {
-				getPreferenceStore().removePropertyChangeListener(taskListNotificationManager);
-				getPreferenceStore().removePropertyChangeListener(taskListBackupManager);
+				if (taskListNotificationManager != null) {
+					getPreferenceStore().removePropertyChangeListener(taskListNotificationManager);
+				}
+				if (taskListBackupManager != null) {
+					getPreferenceStore().removePropertyChangeListener(taskListBackupManager);
+				}
 				getPreferenceStore().removePropertyChangeListener(PROPERTY_LISTENER);
 				//taskListManager.getTaskList().removeChangeListener(taskListSaveManager);
 				CommonColors.dispose();
-- 
cgit v1.2.3