NEW - bug 291698: resetting of activity fails

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

2 files changed, 6 insertions, 4 deletions

diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskActivityManager.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskActivityManager.java
index 0915842a0..81ff8d551 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskActivityManager.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskActivityManager.java
@@ -173,9 +173,10 @@ public class TaskActivityManager implements ITaskActivityManager {
 			for (Calendar cal : new HashSet<Calendar>(activityMap.keySet())) {
 				activityMap.remove(cal);
 			}
+			long elapsedTime = getElapsedTime(task);
 			for (ITaskActivityListener listener : new ArrayList<ITaskActivityListener>(activityListeners)) {
 				try {
-					listener.elapsedTimeUpdated(task, getElapsedTime(task));
+					listener.elapsedTimeUpdated(task, elapsedTime);
 				} catch (Throwable t) {
 					StatusHandler.log(new Status(IStatus.ERROR, ITasksCoreConstants.ID_PLUGIN,
 							"Task activity listener failed: \"" + listener + "\"", t)); //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/PlanningPart.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/PlanningPart.java
index d716013f4..fb7425a21 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/PlanningPart.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/PlanningPart.java
@@ -231,6 +231,10 @@ public class PlanningPart extends AbstractLocalEditorPart {
 				}
 			});
 		}
+
+		TasksUiInternal.getTaskList().addChangeListener(TASK_LIST_LISTENER);
+		TasksUiPlugin.getTaskActivityManager().addActivityListener(timingListener);
+
 		setSection(toolkit, section);
 		return section;
 	}
@@ -252,9 +256,6 @@ public class PlanningPart extends AbstractLocalEditorPart {
 
 //		createActualTime(toolkit, composite);
 
-		TasksUiInternal.getTaskList().addChangeListener(TASK_LIST_LISTENER);
-		TasksUiPlugin.getTaskActivityManager().addActivityListener(timingListener);
-
 		if (needsNotes()) {
 			createNotesArea(toolkit, sectionClient, layout.numColumns);
 		}